SalesforceCommerceCloud
diff --git a/‎.changeset/add-debug-cli-command.md‎
Lines changed: 5 additions & 0 deletions b/‎.changeset/add-debug-cli-command.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.changeset/add-debug-diagnostics-toolset.md‎
Lines changed: 5 additions & 0 deletions b/‎.changeset/add-debug-diagnostics-toolset.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.changeset/add-debug-skill-and-docs.md‎
Lines changed: 6 additions & 0 deletions b/‎.changeset/add-debug-skill-and-docs.md‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎.changeset/add-mcp-server-context.md‎
Lines changed: 5 additions & 0 deletions b/‎.changeset/add-mcp-server-context.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.changeset/add-resolve-breakpoint-path.md‎
Lines changed: 5 additions & 0 deletions b/‎.changeset/add-resolve-breakpoint-path.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎docs/.vitepress/config.mts‎
Lines changed: 39 additions & 12 deletions b/‎docs/.vitepress/config.mts‎
Lines changed: 39 additions & 12 deletions
diff --git a/‎docs/cli/debug.md‎
Lines changed: 218 additions & 5 deletions b/‎docs/cli/debug.md‎
Lines changed: 218 additions & 5 deletions
@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-cli': minor
+---
+
+Add `b2c debug cli` command for interactive terminal-based script debugging. Includes a REPL with commands for breakpoints, stepping, variable inspection, and expression evaluation. Use `--rpc` for JSONL-over-stdio mode suitable for headless scripts and agents.
@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-dx-mcp': minor
+---
+
+Add script debugger MCP tools to the CARTRIDGES and STOREFRONTNEXT toolsets. Includes `debug_start_session`, `debug_end_session`, `debug_list_sessions`, `debug_set_breakpoints`, `debug_wait_for_stop`, `debug_get_stack`, `debug_get_variables`, `debug_evaluate`, `debug_continue`, `debug_step_over`, `debug_step_into`, `debug_step_out`, and `debug_capture_at_breakpoint`.
@@ -0,0 +1,6 @@
+---
+'@salesforce/b2c-dx-docs': patch
+'@salesforce/b2c-agent-plugins': patch
+---
+
+Add debug command documentation and b2c-debug agent skill covering interactive REPL, RPC mode, and DAP usage.
@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-dx-mcp': minor
+---
+
+Add `ServerContext` for persistent server-scoped state across MCP tool invocations. Enables stateful tools (debug sessions, log watches) while preserving per-call config reloading for existing tools.
@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-tooling-sdk': minor
+---
+
+Add `resolveBreakpointPath` utility that normalizes user-provided file paths to SDAPI script paths. Accepts server paths, absolute/relative local paths, and cartridge-name-prefixed paths with helpful error messages on failure.
@@ -128,18 +128,45 @@ const referenceSidebar = [
   {
     text: 'MCP Tools',
     items: [
-      {text: 'cartridge_deploy', link: '/mcp/tools/cartridge-deploy'},
-      {text: 'mrt_bundle_push', link: '/mcp/tools/mrt-bundle-push'},
-      {text: 'pwakit_get_guidelines', link: '/mcp/tools/pwakit-get-guidelines'},
-      {text: 'scapi_schemas_list', link: '/mcp/tools/scapi-schemas-list'},
-      {text: 'scapi_custom_api_generate_scaffold', link: '/mcp/tools/scapi-custom-api-generate-scaffold'},
-      {text: 'scapi_custom_apis_get_status', link: '/mcp/tools/scapi-custom-apis-get-status'},
-      {text: 'sfnext_get_guidelines', link: '/mcp/tools/sfnext-get-guidelines'},
-      {text: 'sfnext_start_figma_workflow', link: '/mcp/tools/sfnext-start-figma-workflow'},
-      {text: 'sfnext_analyze_component', link: '/mcp/tools/sfnext-analyze-component'},
-      {text: 'sfnext_match_tokens_to_theme', link: '/mcp/tools/sfnext-match-tokens-to-theme'},
-      {text: 'sfnext_add_page_designer_decorator', link: '/mcp/tools/sfnext-add-page-designer-decorator'},
-      {text: 'sfnext_configure_theme', link: '/mcp/tools/sfnext-configure-theme'},
+      {
+        text: 'Cartridges',
+        collapsed: true,
+        items: [{text: 'cartridge_deploy', link: '/mcp/tools/cartridge-deploy'}],
+      },
+      {
+        text: 'SCAPI',
+        collapsed: true,
+        items: [
+          {text: 'scapi_schemas_list', link: '/mcp/tools/scapi-schemas-list'},
+          {text: 'scapi_custom_api_generate_scaffold', link: '/mcp/tools/scapi-custom-api-generate-scaffold'},
+          {text: 'scapi_custom_apis_get_status', link: '/mcp/tools/scapi-custom-apis-get-status'},
+        ],
+      },
+      {
+        text: 'PWA Kit',
+        collapsed: true,
+        items: [
+          {text: 'mrt_bundle_push', link: '/mcp/tools/mrt-bundle-push'},
+          {text: 'pwakit_get_guidelines', link: '/mcp/tools/pwakit-get-guidelines'},
+        ],
+      },
+      {
+        text: 'Storefront Next',
+        collapsed: true,
+        items: [
+          {text: 'sfnext_get_guidelines', link: '/mcp/tools/sfnext-get-guidelines'},
+          {text: 'sfnext_start_figma_workflow', link: '/mcp/tools/sfnext-start-figma-workflow'},
+          {text: 'sfnext_analyze_component', link: '/mcp/tools/sfnext-analyze-component'},
+          {text: 'sfnext_match_tokens_to_theme', link: '/mcp/tools/sfnext-match-tokens-to-theme'},
+          {text: 'sfnext_add_page_designer_decorator', link: '/mcp/tools/sfnext-add-page-designer-decorator'},
+          {text: 'sfnext_configure_theme', link: '/mcp/tools/sfnext-configure-theme'},
+        ],
+      },
+      {
+        text: 'Diagnostics',
+        collapsed: true,
+        items: [{text: 'Script Debugger', link: '/mcp/tools/diagnostics'}],
+      },
     ],
   },
 ];
 
@@ -1,10 +1,13 @@
 ---
-description: Start a DAP debug adapter for B2C Commerce server-side script debugging.
+description: DAP debug adapter, interactive REPL, and JSONL RPC mode for B2C Commerce server-side script debugging.
 ---
 
-# Debug Command
+# Debug Commands
 
-The `b2c debug` command launches a [Debug Adapter Protocol (DAP)](https://microsoft.github.io/debug-adapter-protocol/) adapter that bridges your IDE to the B2C Commerce script debugger. It's designed to be invoked by an IDE (VS Code, JetBrains, etc.) over stdio, not run directly in a shell.
+Commands for connecting to the B2C Commerce Script Debugger API (SDAPI) to set breakpoints, inspect variables, and step through server-side code.
+
+- **`b2c debug`** — Debug Adapter Protocol (DAP) adapter for IDE integrations (VS Code, JetBrains, etc.).
+- **`b2c debug cli`** — interactive terminal REPL, or JSONL-over-stdio RPC mode for headless scripts and agents.
 
 ## Authentication
 
@@ -14,11 +17,15 @@ The script debugger uses **Basic auth** (Business Manager username and password)
 - `SFCC_USERNAME` / `SFCC_PASSWORD` environment variables
 - `username` / `password` fields in `dw.json`
 
+The script debugger must also be enabled on the instance: Business Manager > Administration > Development Configuration > Script Debugger > Enable.
+
 See the [Authentication Guide](/guide/authentication) for details.
 
+---
+
 ## b2c debug
 
-Start the DAP adapter for the configured B2C instance.
+The `b2c debug` command launches a [Debug Adapter Protocol (DAP)](https://microsoft.github.io/debug-adapter-protocol/) adapter that bridges your IDE to the B2C Commerce script debugger. It's designed to be invoked by an IDE over stdio, not run directly in a shell.
 
 ### Usage
 
@@ -52,8 +59,214 @@ b2c debug --client-id my-debugger
 
 Most IDEs spawn DAP adapters automatically based on a launch configuration. The adapter speaks DAP over **stdin/stdout**, so direct shell invocation will appear to hang — that's expected. Configure your IDE's debug launcher to invoke `b2c debug` and supply the appropriate environment.
 
-## Notes
+### Notes
 
 - A warning is emitted if no cartridges are found at `--cartridge-path`.
 - Source maps are derived from the discovered cartridge layout; ensure your local cartridge tree matches what's deployed to the instance, otherwise breakpoints may not bind.
 - The adapter exits when its stdin stream closes.
+
+---
+
+## b2c debug cli
+
+Start an interactive CLI debug session with a REPL interface. Provides a terminal-based debugging experience without requiring a DAP client. Add `--rpc` to switch to JSONL-over-stdio mode for headless scripts and agents.
+
+### Usage
+
+```bash
+b2c debug cli [--cartridge-path <PATH>] [--client-id <ID>] [--rpc]
+```
+
+### Flags
+
+| Flag | Description | Default |
+|------|-------------|---------|
+| `--cartridge-path` | Path to directory containing cartridges | `.` |
+| `--client-id` | Client ID for the debugger API | `b2c-cli` |
+| `--rpc` | Run in RPC mode (JSONL over stdin/stdout) | `false` |
+
+Inherits the [global instance and authentication flags](./index#global-flags).
+
+### REPL Commands
+
+| Command | Alias | Description |
+|---------|-------|-------------|
+| `break <file>:<line> [if <cond>]` | `b` | Set breakpoint |
+| `breakpoints` | `bl` | List active breakpoints |
+| `delete <id>` | `d` | Delete breakpoint |
+| `continue` | `c` | Resume current thread |
+| `step` | `s` | Step over |
+| `stepin` | `si` | Step into |
+| `stepout` | `so` | Step out |
+| `stack` | `bt` | Show call stack |
+| `frame <n>` | `f` | Select stack frame |
+| `vars` | `v` | Show variables in current frame |
+| `members <path>` | `m` | Expand object members |
+| `eval <expr>` | `e` | Evaluate expression |
+| `threads` | `t` | List known threads |
+| `thread <id>` | | Switch to thread |
+| `help` | `h` | Show commands |
+| `quit` | `q` | Disconnect and exit |
+
+### Examples
+
+```bash
+# Start interactive debugger
+b2c debug cli
+
+# Specify cartridge directory
+b2c debug cli --cartridge-path ./cartridges
+
+# Use a custom client ID (for concurrent sessions)
+b2c debug cli --client-id my-session
+
+# Start in RPC mode for headless scripts
+b2c debug cli --rpc
+```
+
+### Interactive Session Example
+
+```
+debug> break Cart.js:42
+Breakpoint #1 set at ./cartridges/app_storefront/cartridge/controllers/Cart.js:42
+
+debug> break Checkout.js:100 if basket.totalGrossPrice > 100
+Breakpoint #2 set at ./cartridges/app_storefront/cartridge/controllers/Checkout.js:100
+
+● Thread 5 halted at ./cartridges/app_storefront/cartridge/controllers/Cart.js:42 in show()
+
+debug> vars
+  request: dw.system.Request = [object Request] [local]
+  basket: dw.order.Basket = [object Basket] [local]
+
+debug> eval basket.productLineItems.length
+3
+
+debug> stack
+  → #0  show  ./cartridges/app_storefront/cartridge/controllers/Cart.js:42
+    #1  execute  /app_storefront/cartridge/controllers/Cart.js:1
+
+debug> continue
+Thread 5 resumed.
+```
+
+---
+
+## RPC Mode
+
+When started with `--rpc`, the debug CLI runs as a JSONL-over-stdio RPC server. This enables headless scripts, agents, and other tools to drive the debugger programmatically.
+
+### Protocol
+
+- **Input** (stdin): One JSON object per line (JSONL)
+- **Output** (stdout): One JSON object per line — either a response or an async event
+
+### Request Format
+
+```json
+{"id": 1, "command": "set_breakpoints", "args": {"breakpoints": [{"file": "Cart.js", "line": 42}]}}
+```
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `id` | number or string | Optional. Echoed back in the response for correlation. |
+| `command` | string | Required. The command to execute. |
+| `args` | object | Optional. Command-specific arguments. |
+
+### Response Format
+
+```json
+{"id": 1, "result": {"breakpoints": [{"id": 1, "file": "Cart.js", "line": 42, "script_path": "/app_storefront/cartridge/controllers/Cart.js"}]}}
+```
+
+On error:
+
+```json
+{"id": 1, "error": "No thread selected. Wait for a thread_stopped event."}
+```
+
+### Event Format
+
+Events are emitted asynchronously (not in response to a command):
+
+```json
+{"event": "ready", "data": {}}
+{"event": "thread_stopped", "data": {"thread_id": 5, "location": {"file": "Cart.js", "line": 42, "function_name": "show", "script_path": "/app_storefront/cartridge/controllers/Cart.js"}}}
+```
+
+### Available Commands
+
+| Command | Args | Description |
+|---------|------|-------------|
+| `set_breakpoints` | `breakpoints: [{file, line, condition?}]` | Replace all breakpoints |
+| `list_breakpoints` | | List current breakpoints |
+| `continue` | `thread_id?` | Resume a halted thread |
+| `step_over` | `thread_id?` | Step to next line |
+| `step_into` | `thread_id?` | Step into function call |
+| `step_out` | `thread_id?` | Step out of function |
+| `get_stack` | `thread_id?` | Get call stack frames |
+| `get_variables` | `thread_id?, frame_index?, scope?, object_path?` | Get variables |
+| `evaluate` | `expression, thread_id?, frame_index?` | Evaluate expression |
+| `list_threads` | | List known threads |
+| `select_thread` | `thread_id` | Switch current thread |
+| `select_frame` | `index` | Switch current frame |
+
+When `thread_id` is omitted, the last thread that halted is used.
+
+### Events
+
+| Event | Description |
+|-------|-------------|
+| `ready` | Emitted once after connection is established |
+| `thread_stopped` | A thread hit a breakpoint or step completed |
+
+### Example Session (Python)
+
+```python
+import subprocess, json
+
+proc = subprocess.Popen(
+    ["b2c", "debug", "cli", "--rpc"],
+    stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+    text=True, bufsize=1
+)
+
+def send(cmd, args=None, id=None):
+    msg = {"command": cmd}
+    if args: msg["args"] = args
+    if id is not None: msg["id"] = id
+    proc.stdin.write(json.dumps(msg) + "\n")
+    proc.stdin.flush()
+
+def recv():
+    return json.loads(proc.stdout.readline())
+
+# Wait for ready
+assert recv()["event"] == "ready"
+
+# Set a breakpoint
+send("set_breakpoints", {"breakpoints": [{"file": "Cart.js", "line": 42}]}, id=1)
+response = recv()  # {"id": 1, "result": {...}}
+
+# Wait for breakpoint hit (trigger a request on the instance)
+event = recv()  # {"event": "thread_stopped", "data": {...}}
+
+# Inspect state
+send("get_stack", id=2)
+stack = recv()
+
+send("get_variables", id=3)
+variables = recv()
+
+# Continue execution
+send("continue", id=4)
+recv()
+```
+
+---
+
+## See Also
+
+- [Authentication Guide](/guide/authentication) — Setting up instance credentials
+- [Logs Commands](/cli/logs) — Retrieving server logs for debugging
+- [Code Commands](/cli/code) — Deploying code before debugging
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@salesforce/b2c-cli': minor
 +---
++
 +Add `b2c debug cli` command for interactive terminal-based script debugging. Includes a REPL with commands for breakpoints, stepping, variable inspection, and expression evaluation. Use `--rpc` for JSONL-over-stdio mode suitable for headless scripts and agents.