@cspeach/cli 1.1.22 → 1.1.24

package/dist/tools/local-build.js

@@ -16,6 +16,9 @@
  *               depends on), fiori_metadata_audit, fiori_draft_smoke
  *               (L1-5b — a SAP write, approval-gated like every write),
  *               fiori_sample_search, fiori_sample_get
+ *   cap:        cap_metadata_import (CAP phase 2 — writes srv/external/<API>.edmx),
+ *               sap_service_catalog (read-only Gateway catalog, used in design),
+ *               sap_link, cap_link_smoke (S/4 link check; its write leg is approval-gated)
  *   extend:     extend_model_insert (anchored CDS/DDLX edit — abap-extend-model)
  *   subagent:   agent_run (Task 7, 2026-07-03 — customers get subagent
  *               dispatch when local_build is on; plan phases force its
@@ -71,6 +74,16 @@ export const LOCAL_BUILD_TOOLS = [
     'fiori_draft_smoke',
     'fiori_sample_search',
     'fiori_sample_get',
+    // CAP phase 2 (Task 10) — writes srv/external/<API>.edmx from a SAP $metadata.
+    'cap_metadata_import',
+    // R25 (final wave) — Gateway catalog read for design; gated so non-CAP users' tool list is unchanged.
+    'sap_service_catalog',
+    // CAP phase 2 (Task 8) — the SAP link: a local CAP app's [s4] profile reaches S/4 through it.
+    'sap_link',
+    // CAP phase 2 (Task 11) — S/4 link check: live read vs direct S/4, dev-only update-then-restore.
+    'cap_link_smoke',
+    // App lane routing (slice 1, Task 5) — reads the spec file like read_document; writes only .cspeach/lane + [app-lane].
+    'app_lane_resolve',
     'extend_model_insert',
     'system_capability',
     'agent_run',
@@ -98,6 +111,8 @@ export const STANDALONE_FILE_TOOLS = [
     'file_edit',
     'glob',
     'grep',
+    // App lane routing — /abap-app in standalone mode decides the lane on declared facts.
+    'app_lane_resolve',
 ];
 export function applyStandaloneFileTools(cwd) {
     enableToolFlags([...STANDALONE_FILE_TOOLS]);

package/dist/tools/subagent/_background-shared.js

@@ -15,11 +15,27 @@
  * spawned in.
  *
  * Exit handler installed exactly once via installExitHandler(). When
- * Node exits (normal or signal), every tracked child is SIGTERMd, then
- * SIGKILLd after KILL_GRACE_MS ms. Both timers .unref() so they don't
- * keep Node alive past the legitimate shutdown.
+ * Node exits (normal or signal), every tracked LIVE child is stopped:
+ *   - Windows: the whole tree, synchronously, with the absolute taskkill
+ *     `/T /F` shared with the Fiori preview registry. `child.kill()` there is
+ *     TerminateProcess on the direct child only — and cross-spawn runs a
+ *     `.cmd` shim (`cds.cmd`, `npm.cmd`) through cmd.exe, which creates no job
+ *     object, so the real server (e.g. `cds watch`'s `watched` grandchild)
+ *     kept the port (task 14c finding 3).
+ *     If taskkill cannot run or fails (not exit 0 / 128), fall back to the
+ *     direct kill below.
+ *   - POSIX: SIGTERM to the direct child, then SIGKILL after KILL_GRACE_MS
+ *     (timer .unref()d).
+ * Identity rule (same as preview): only a child handle this process still
+ * holds live, and only a pid > 1.
+ *
+ * The handler is a hook on lib/shutdown-hooks.ts, NOT its own process
+ * listeners: our own appended SIGINT/SIGTERM listeners used to stop Node's
+ * default "exit on signal", so SIGTERM no longer ended the CLI.
  */
 import { KILL_GRACE_MS } from '../_command-shared.js';
+import { registerShutdownHook } from '../../lib/shutdown-hooks.js';
+import { childIsLive, killablePid, taskkillTreeSync } from '../fiori/preview/registry.js';
 export const MAX_EVENTS_PER_BG = 10_000;
 const registry = new Map();
 let exitHandlerInstalled = false;
@@ -83,46 +99,52 @@ export function consumeEvents(bg_id, max) {
         signal: entry.signal,
     };
 }
+let treeKillImpl = taskkillTreeSync;
+/** Stop one entry's process tree, synchronously where it matters (Windows). */
+function stopEntrySync(entry) {
+    const child = entry.child;
+    if (entry.closed || !childIsLive(child))
+        return;
+    if (process.platform === 'win32' && killablePid(child.pid)) {
+        // taskkill failed to run, timed out, or exited with an error → fall back
+        // to the direct kill so at least the child itself goes.
+        if (treeKillImpl(child.pid))
+            return;
+    }
+    try {
+        child.kill('SIGTERM');
+    }
+    catch { /* ignore */ }
+    const t = setTimeout(() => {
+        try {
+            if (childIsLive(child))
+                child.kill('SIGKILL');
+        }
+        catch { /* ignore */ }
+    }, KILL_GRACE_MS);
+    t.unref();
+}
+/** Stop every live background child (and, on Windows, its descendants). */
+export function killAllBackgroundSync() {
+    for (const entry of registry.values()) {
+        try {
+            stopEntrySync(entry);
+        }
+        catch { /* best effort: one failure never blocks the rest */ }
+    }
+}
 /** Idempotent. Subsequent calls are silent no-ops. */
 export function installExitHandler() {
     if (exitHandlerInstalled)
         return;
     exitHandlerInstalled = true;
-    // 'exit' fires synchronously during Node shutdown. Best-effort SIGTERM
-    // each tracked child; the SIGKILL escalation timer cannot fire from
-    // inside an 'exit' handler (event-loop is shutting down) so we
-    // additionally hook SIGINT/SIGTERM/SIGHUP below for graceful paths
-    // where the loop is still alive.
-    process.on('exit', () => {
-        for (const entry of registry.values()) {
-            if (!entry.closed) {
-                try {
-                    entry.child.kill('SIGTERM');
-                }
-                catch { /* ignore */ }
-            }
-        }
-    });
-    for (const sig of ['SIGINT', 'SIGTERM', 'SIGHUP']) {
-        process.on(sig, () => {
-            for (const entry of registry.values()) {
-                if (!entry.closed) {
-                    try {
-                        entry.child.kill('SIGTERM');
-                    }
-                    catch { /* ignore */ }
-                    const t = setTimeout(() => {
-                        try {
-                            entry.child.kill('SIGKILL');
-                        }
-                        catch { /* ignore */ }
-                    }, KILL_GRACE_MS);
-                    t.unref();
-                }
-            }
-        });
-    }
+    // One shared exit/signal handler for every managed resource (runs on 'exit'
+    // and on SIGINT/SIGTERM/SIGHUP, and re-raises so the CLI still exits).
+    registerShutdownHook(killAllBackgroundSync);
 }
+/** Test-only — replace / restore the Windows tree kill. */
+export function __setTreeKillForTests(fn) { treeKillImpl = fn; }
+export function __resetTreeKillForTests() { treeKillImpl = taskkillTreeSync; }
 /** Test-only — clears registry between cases. Does NOT uninstall the exit handler (handler is process-lifetime-scoped). */
 export function __resetRegistryForTests() {
     registry.clear();

package/dist/tools/subagent/background_run.js

@@ -8,9 +8,11 @@
  * Child stdout/stderr lines stream into the registry as BgEvents;
  * monitor_emit drains them.
  *
- * Child does NOT outlive the CLI process — the registry's exit
- * handler SIGTERMs every live child on Node exit and SIGKILLs after
- * KILL_GRACE_MS.
+ * Child does NOT outlive the CLI process. There is no per-job stop: when
+ * the CLI exits or gets SIGINT/SIGTERM/SIGHUP, the registry's shutdown hook
+ * stops every live child — on Windows the whole process tree (absolute
+ * taskkill /T /F, falling back to a direct kill), on POSIX SIGTERM to the
+ * direct child, then SIGKILL after KILL_GRACE_MS.
  *
  * Flag-gated: invisible to listTools() unless
  * CSPEACH_TOOL_BACKGROUND_RUN=on. isMutating: true — hooks the existing
@@ -135,14 +137,16 @@ export async function backgroundRunHandler(args, ctx) {
             `pid: ${child.pid ?? 'unknown'}\n` +
             `cwd: ${cwd}\n` +
             `note: child is running — call monitor_emit with this bg_id to drain stdout/stderr/exit events. ` +
-            `child will be SIGTERMd on CLI exit (then SIGKILLd after grace).`,
+            `there is no per-job stop: the child runs until the CLI exits, which stops it ` +
+            `(on Windows the whole process tree; on POSIX SIGTERM to the child, SIGKILL after grace).`,
     };
 }
 registerTool({
     name: 'background_run',
     description: 'Spawn a safelisted command as a non-blocking background process. Returns a bg_id immediately; ' +
         'caller polls events via monitor_emit. Same safelist + argv-only + env scrub as shell_exec. ' +
-        'Child does NOT outlive the CLI process — SIGTERM on exit, SIGKILL after grace.',
+        'No per-job stop: the child runs until the CLI exits or gets a signal, which stops it — ' +
+        'the whole process tree on Windows; SIGTERM to the child (SIGKILL after grace) on POSIX.',
     isMutating: true,
     category: 'subagent',
     flagGated: true,

package/dist/tools/tool-loading.js

@@ -53,6 +53,8 @@ export const SKILL_STARTERS = Object.freeze({
     'abap-transport': TRANSPORT_FAMILY,
     'abap-transport-analysis': [...TRANSPORT_FAMILY, 'sap_atc_run', 'sap_usage_references'],
     'abap-cap': ['fiori_scaffold_fe', 'fiori_render_smoke', 'fiori_draft_smoke'],
+    // Both flag-gated (LOCAL_BUILD_TOOLS / STANDALONE_FILE_TOOLS): skipped when off.
+    'abap-app': ['app_lane_resolve', 'read_document'],
     'abap-atc-fix': ['sap_atc_run'],
     'abap-cca': ['sap_atc_run', 'sap_usage_references', 'sap_api_state'],
     'abap-clean-core': ['sap_api_state', 'sap_atc_run', 'sap_usage_references'],

package/package.json

@@ -1,121 +1,121 @@
-{
-  "name": "@cspeach/cli",
-  "version": "1.1.22",
-  "description": "CSPeach — AI-assisted ABAP development CLI. Direct SAP access, 34 skills, safety gates.",
-  "keywords": [
-    "abap",
-    "sap",
-    "ai",
-    "cli",
-    "ai-assisted-development",
-    "s4hana",
-    "abap-development",
-    "claude",
-    "anthropic"
-  ],
-  "homepage": "https://cspeach.dev",
-  "bugs": {
-    "email": "laeeq.siddique@cremencing.com"
-  },
-  "author": "Laeeq Siddique (Cremencing Solutions)",
-  "license": "SEE LICENSE IN LICENSE",
-  "private": false,
-  "publishConfig": {
-    "access": "public"
-  },
-  "type": "module",
-  "bin": {
-    "cspeach": "dist/index.js"
-  },
-  "scripts": {
-    "dev": "tsx src/index.ts",
-    "prebuild": "tsx scripts/prebuild.ts",
-    "build": "tsc && node scripts/make-bin-executable.js",
-    "install:global": "tsx scripts/install-global.ts",
-    "pretest": "tsx scripts/sync-signing-key.ts || node -e \"console.warn('WARN: sync-signing-key skipped — using stub')\"",
-    "start": "node dist/index.js",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:smoke-e2e": "vitest run --config vitest.smoke-e2e.config.ts",
-    "adt:smoke": "tsx scripts/adt-smoke.ts",
-    "smoke:all": "pnpm zcspeach:smoke && pnpm adt:smoke",
-    "zcspeach:smoke": "tsx scripts/zcspeach-smoke.ts",
-    "bench:models": "tsx scripts/bench-models.ts",
-    "bench:audit": "tsx scripts/bench-audit-task.ts",
-    "bench:replay": "tsx bench/replay/run.ts",
-    "fiori": "tsx src/tools/fiori/bin.ts",
-    "prepare": "husky",
-    "prepublishOnly": "node -e \"const deps=require('./package.json').dependencies||{}; for (const n of ['@cspeach/sap-client','@cspeach/register-core']) { const d=deps[n]||''; if(d.startsWith('file:')||d.startsWith('link:')){console.error('publish blocked: '+n+' is a local link ('+d+') — point it at the published version before npm publish'); process.exit(1)} }\""
-  },
-  "engines": {
-    "node": ">=20.0.0"
-  },
-  "dependencies": {
-    "@anthropic-ai/sdk": "^0.90.0",
-    "@cspeach/register-core": "0.1.0",
-    "@cspeach/sap-client": "0.1.15",
-    "@iarna/toml": "^2.2.5",
-    "@inkjs/ui": "^2.0.0",
-    "@inquirer/prompts": "^7.0.0",
-    "@napi-rs/keyring": "2.1.0",
-    "@noble/ed25519": "2.1.0",
-    "@noble/hashes": "1.4.0",
-    "@sap-ux/annotation-converter": "0.10.21",
-    "@sap-ux/edmx-parser": "0.10.0",
-    "@sap-ux/fe-fpm-writer": "0.43.7",
-    "@sap-ux/fiori-elements-writer": "^3.0.39",
-    "@sap-ux/fiori-freestyle-writer": "3.0.12",
-    "@sap-ux/vocabularies-types": "0.15.0",
-    "adm-zip": "0.5.17",
-    "chalk": "^5.3.0",
-    "cli-highlight": "^2.1.11",
-    "cli-table3": "^0.6.5",
-    "clipboardy": "^5.3.1",
-    "cross-spawn": "^7.0.6",
-    "diff": "^9.0.0",
-    "ejs": "3.1.10",
-    "fuse.js": "^7.0.0",
-    "ink": "^5.0.0",
-    "ink-text-input": "^6.0.0",
-    "jose": "^5.9.0",
-    "mammoth": "^1.8.0",
-    "marked": "^11.2.0",
-    "marked-terminal": "^6.2.0",
-    "mem-fs": "2.1.0",
-    "mem-fs-editor": "9.4.0",
-    "node-machine-id": "^1.1.12",
-    "openai": "^6.49.0",
-    "puppeteer-core": "24.10.2",
-    "react": "^18.3.0",
-    "string-width": "^7.2.0",
-    "turndown": "^7.2.0",
-    "unpdf": "1.7.0",
-    "zod": "^3.23.0"
-  },
-  "devDependencies": {
-    "@sap-ux/ui5-middleware-fe-mockserver": "2.4.17",
-    "@types/adm-zip": "0.5.8",
-    "@types/cross-spawn": "^6.0.6",
-    "@types/diff": "^7.0.2",
-    "@types/ejs": "^3.1.5",
-    "@types/node": "^20.17.0",
-    "@types/react": "^18.3.0",
-    "@types/turndown": "^5.0.5",
-    "@ui5/builder": "4.3.2",
-    "@ui5/fs": "4.0.6",
-    "docx": "^9.0.2",
-    "husky": "^9.1.7",
-    "ink-testing-library": "^4.0.0",
-    "pdf-lib": "^1.17.1",
-    "strip-ansi": "6.0.1",
-    "tsx": "^4.19.0",
-    "typescript": "^5.7.0",
-    "vitest": "^2.1.0"
-  },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "esbuild"
-    ]
-  }
-}
+{
+  "name": "@cspeach/cli",
+  "version": "1.1.24",
+  "description": "CSPeach — AI-assisted ABAP development CLI. Direct SAP access, 34 skills, safety gates.",
+  "keywords": [
+    "abap",
+    "sap",
+    "ai",
+    "cli",
+    "ai-assisted-development",
+    "s4hana",
+    "abap-development",
+    "claude",
+    "anthropic"
+  ],
+  "homepage": "https://cspeach.dev",
+  "bugs": {
+    "email": "laeeq.siddique@cremencing.com"
+  },
+  "author": "Laeeq Siddique (Cremencing Solutions)",
+  "license": "SEE LICENSE IN LICENSE",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "bin": {
+    "cspeach": "dist/index.js"
+  },
+  "scripts": {
+    "dev": "tsx src/index.ts",
+    "prebuild": "tsx scripts/prebuild.ts",
+    "build": "tsc && node scripts/make-bin-executable.js",
+    "install:global": "tsx scripts/install-global.ts",
+    "pretest": "tsx scripts/sync-signing-key.ts || node -e \"console.warn('WARN: sync-signing-key skipped — using stub')\"",
+    "start": "node dist/index.js",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:smoke-e2e": "vitest run --config vitest.smoke-e2e.config.ts",
+    "adt:smoke": "tsx scripts/adt-smoke.ts",
+    "smoke:all": "pnpm zcspeach:smoke && pnpm adt:smoke",
+    "zcspeach:smoke": "tsx scripts/zcspeach-smoke.ts",
+    "bench:models": "tsx scripts/bench-models.ts",
+    "bench:audit": "tsx scripts/bench-audit-task.ts",
+    "bench:replay": "tsx bench/replay/run.ts",
+    "fiori": "tsx src/tools/fiori/bin.ts",
+    "prepare": "husky",
+    "prepublishOnly": "node -e \"const deps=require('./package.json').dependencies||{}; for (const n of ['@cspeach/sap-client','@cspeach/register-core']) { const d=deps[n]||''; if(d.startsWith('file:')||d.startsWith('link:')){console.error('publish blocked: '+n+' is a local link ('+d+') — point it at the published version before npm publish'); process.exit(1)} }\""
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  },
+  "dependencies": {
+    "@anthropic-ai/sdk": "^0.90.0",
+    "@cspeach/register-core": "0.1.0",
+    "@cspeach/sap-client": "0.1.15",
+    "@iarna/toml": "^2.2.5",
+    "@inkjs/ui": "^2.0.0",
+    "@inquirer/prompts": "^7.0.0",
+    "@napi-rs/keyring": "2.1.0",
+    "@noble/ed25519": "2.1.0",
+    "@noble/hashes": "1.4.0",
+    "@sap-ux/annotation-converter": "0.10.21",
+    "@sap-ux/edmx-parser": "0.10.0",
+    "@sap-ux/fe-fpm-writer": "0.43.7",
+    "@sap-ux/fiori-elements-writer": "^3.0.39",
+    "@sap-ux/fiori-freestyle-writer": "3.0.12",
+    "@sap-ux/vocabularies-types": "0.15.0",
+    "adm-zip": "0.5.17",
+    "chalk": "^5.3.0",
+    "cli-highlight": "^2.1.11",
+    "cli-table3": "^0.6.5",
+    "clipboardy": "^5.3.1",
+    "cross-spawn": "^7.0.6",
+    "diff": "^9.0.0",
+    "ejs": "3.1.10",
+    "fuse.js": "^7.0.0",
+    "ink": "^5.0.0",
+    "ink-text-input": "^6.0.0",
+    "jose": "^5.9.0",
+    "mammoth": "^1.8.0",
+    "marked": "^11.2.0",
+    "marked-terminal": "^6.2.0",
+    "mem-fs": "2.1.0",
+    "mem-fs-editor": "9.4.0",
+    "node-machine-id": "^1.1.12",
+    "openai": "^6.49.0",
+    "puppeteer-core": "24.10.2",
+    "react": "^18.3.0",
+    "string-width": "^7.2.0",
+    "turndown": "^7.2.0",
+    "unpdf": "1.7.0",
+    "zod": "^3.23.0"
+  },
+  "devDependencies": {
+    "@sap-ux/ui5-middleware-fe-mockserver": "2.4.17",
+    "@types/adm-zip": "0.5.8",
+    "@types/cross-spawn": "^6.0.6",
+    "@types/diff": "^7.0.2",
+    "@types/ejs": "^3.1.5",
+    "@types/node": "^20.17.0",
+    "@types/react": "^18.3.0",
+    "@types/turndown": "^5.0.5",
+    "@ui5/builder": "4.3.2",
+    "@ui5/fs": "4.0.6",
+    "docx": "^9.0.2",
+    "husky": "^9.1.7",
+    "ink-testing-library": "^4.0.0",
+    "pdf-lib": "^1.17.1",
+    "strip-ansi": "6.0.1",
+    "tsx": "^4.19.0",
+    "typescript": "^5.7.0",
+    "vitest": "^2.1.0"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "esbuild"
+    ]
+  }
+}