opensip-cli 0.1.5 → 0.1.7

package/dist/bootstrap/phase-map.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Single orchestration vocabulary: maps lifecycle steps, pre-action phases, and
+ * the implementing modules. Replaces parallel taxonomies in tool-lifecycle.ts
+ * and pre-action-bootstrap-phases.ts as the one source of truth.
+ */
+import { PRE_ACTION_PHASES } from './pre-action-bootstrap-phases.js';
+import { TOOL_LIFECYCLE_STEPS } from './tool-lifecycle.js';
+/** One row in the orchestration map. */
+export interface PhaseMapEntry {
+    readonly lifecycleStep?: (typeof TOOL_LIFECYCLE_STEPS)[keyof typeof TOOL_LIFECYCLE_STEPS];
+    readonly preActionPhase?: (typeof PRE_ACTION_PHASES)[keyof typeof PRE_ACTION_PHASES];
+    readonly module: string;
+    readonly symbol: string;
+}
+/**
+ * Canonical phase map. Startup steps 1–4 live in `bootstrapCli`; step 8 in
+ * `mountAllToolCommands`; steps 5–7 and 9 in the pre-action executor.
+ */
+export declare const BOOTSTRAP_PHASE_MAP: readonly PhaseMapEntry[];
+//# sourceMappingURL=phase-map.d.ts.map

package/dist/bootstrap/phase-map.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"phase-map.d.ts","sourceRoot":"","sources":["../../src/bootstrap/phase-map.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,wCAAwC;AACxC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,OAAO,oBAAoB,CAAC,CAAC;IAC1F,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,OAAO,iBAAiB,CAAC,CAAC;IACrF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,SAAS,aAAa,EA+F9C,CAAC"}

package/dist/bootstrap/phase-map.js

@@ -0,0 +1,108 @@
+/**
+ * Single orchestration vocabulary: maps lifecycle steps, pre-action phases, and
+ * the implementing modules. Replaces parallel taxonomies in tool-lifecycle.ts
+ * and pre-action-bootstrap-phases.ts as the one source of truth.
+ */
+import { PRE_ACTION_PHASES } from './pre-action-bootstrap-phases.js';
+import { TOOL_LIFECYCLE_STEPS } from './tool-lifecycle.js';
+/**
+ * Canonical phase map. Startup steps 1–4 live in `bootstrapCli`; step 8 in
+ * `mountAllToolCommands`; steps 5–7 and 9 in the pre-action executor.
+ */
+export const BOOTSTRAP_PHASE_MAP = [
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.discover,
+        module: 'bootstrap/index.ts',
+        symbol: 'bootstrapCli → registerFirstPartyTools / discoverAndRegisterToolPackages',
+    },
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.compat,
+        module: 'bootstrap/admit-tool-package.ts',
+        symbol: 'admitToolPackage',
+    },
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.trust,
+        module: 'bootstrap/register-tools-discovery.ts',
+        symbol: 'admitProjectLocalTool',
+    },
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.import,
+        module: 'bootstrap/validate-tool.ts',
+        symbol: 'isValidTool + ToolRegistry.register',
+    },
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.config,
+        preActionPhase: PRE_ACTION_PHASES.buildScope,
+        module: 'bootstrap/config-and-capabilities.ts',
+        symbol: 'composeAndValidateToolConfig',
+    },
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.scope,
+        preActionPhase: PRE_ACTION_PHASES.buildScope,
+        module: 'bootstrap/build-per-run-scope.ts',
+        symbol: 'buildPerRunScope → resolveToolHooks().contributeScope',
+    },
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.capabilities,
+        preActionPhase: PRE_ACTION_PHASES.toolPreflight,
+        module: 'bootstrap/config-and-capabilities.ts',
+        symbol: 'wireCapabilityRegistry + loadOwningToolCapabilities',
+    },
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.mount,
+        module: 'bootstrap/register-tools-mount.ts',
+        symbol: 'mountAllToolCommands (composition root)',
+    },
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.initialize,
+        preActionPhase: PRE_ACTION_PHASES.toolPreflight,
+        module: 'bootstrap/owning-tool-init.ts',
+        symbol: 'maybeInitializeOwningTool',
+    },
+    {
+        lifecycleStep: TOOL_LIFECYCLE_STEPS.dispatch,
+        module: 'commands/mount-command-spec.ts',
+        symbol: 'mountCommandSpec action',
+    },
+    {
+        preActionPhase: PRE_ACTION_PHASES.readCommandOptions,
+        module: 'bootstrap/plan-pre-action-bootstrap.ts',
+        symbol: 'planPreActionBootstrap',
+    },
+    {
+        preActionPhase: PRE_ACTION_PHASES.mergeCliDefaults,
+        module: 'bootstrap/plan-pre-action-bootstrap.ts',
+        symbol: 'planPreActionBootstrap → mergeCliDefaults',
+    },
+    {
+        preActionPhase: PRE_ACTION_PHASES.resolveProject,
+        module: 'bootstrap/plan-pre-action-bootstrap.ts',
+        symbol: 'planPreActionBootstrap → resolveProjectContext',
+    },
+    {
+        preActionPhase: PRE_ACTION_PHASES.bailoutWindow,
+        module: 'bootstrap/pre-action-guards.ts',
+        symbol: 'pre-action guards',
+    },
+    {
+        preActionPhase: PRE_ACTION_PHASES.projectSideEffects,
+        module: 'bootstrap/execute-post-bailout-bootstrap.ts',
+        symbol: 'executePostBailoutBootstrap → projectSideEffects',
+    },
+    {
+        preActionPhase: PRE_ACTION_PHASES.enterScope,
+        module: 'bootstrap/execute-post-bailout-bootstrap.ts',
+        symbol: 'enterScope',
+    },
+    {
+        preActionPhase: PRE_ACTION_PHASES.hostStartEffects,
+        module: 'bootstrap/execute-post-bailout-bootstrap.ts',
+        symbol: 'executePostBailoutBootstrap → hostStartEffects',
+    },
+    {
+        preActionPhase: PRE_ACTION_PHASES.dispose,
+        module: 'bootstrap/pre-action-hook.ts',
+        symbol: 'disposeCurrentScope',
+    },
+];
+//# sourceMappingURL=phase-map.js.map

package/dist/bootstrap/phase-map.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"phase-map.js","sourceRoot":"","sources":["../../src/bootstrap/phase-map.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAU3D;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAA6B;IAC3D;QACE,aAAa,EAAE,oBAAoB,CAAC,QAAQ;QAC5C,MAAM,EAAE,oBAAoB;QAC5B,MAAM,EAAE,0EAA0E;KACnF;IACD;QACE,aAAa,EAAE,oBAAoB,CAAC,MAAM;QAC1C,MAAM,EAAE,iCAAiC;QACzC,MAAM,EAAE,kBAAkB;KAC3B;IACD;QACE,aAAa,EAAE,oBAAoB,CAAC,KAAK;QACzC,MAAM,EAAE,uCAAuC;QAC/C,MAAM,EAAE,uBAAuB;KAChC;IACD;QACE,aAAa,EAAE,oBAAoB,CAAC,MAAM;QAC1C,MAAM,EAAE,4BAA4B;QACpC,MAAM,EAAE,qCAAqC;KAC9C;IACD;QACE,aAAa,EAAE,oBAAoB,CAAC,MAAM;QAC1C,cAAc,EAAE,iBAAiB,CAAC,UAAU;QAC5C,MAAM,EAAE,sCAAsC;QAC9C,MAAM,EAAE,8BAA8B;KACvC;IACD;QACE,aAAa,EAAE,oBAAoB,CAAC,KAAK;QACzC,cAAc,EAAE,iBAAiB,CAAC,UAAU;QAC5C,MAAM,EAAE,kCAAkC;QAC1C,MAAM,EAAE,uDAAuD;KAChE;IACD;QACE,aAAa,EAAE,oBAAoB,CAAC,YAAY;QAChD,cAAc,EAAE,iBAAiB,CAAC,aAAa;QAC/C,MAAM,EAAE,sCAAsC;QAC9C,MAAM,EAAE,qDAAqD;KAC9D;IACD;QACE,aAAa,EAAE,oBAAoB,CAAC,KAAK;QACzC,MAAM,EAAE,mCAAmC;QAC3C,MAAM,EAAE,yCAAyC;KAClD;IACD;QACE,aAAa,EAAE,oBAAoB,CAAC,UAAU;QAC9C,cAAc,EAAE,iBAAiB,CAAC,aAAa;QAC/C,MAAM,EAAE,+BAA+B;QACvC,MAAM,EAAE,2BAA2B;KACpC;IACD;QACE,aAAa,EAAE,oBAAoB,CAAC,QAAQ;QAC5C,MAAM,EAAE,gCAAgC;QACxC,MAAM,EAAE,yBAAyB;KAClC;IACD;QACE,cAAc,EAAE,iBAAiB,CAAC,kBAAkB;QACpD,MAAM,EAAE,wCAAwC;QAChD,MAAM,EAAE,wBAAwB;KACjC;IACD;QACE,cAAc,EAAE,iBAAiB,CAAC,gBAAgB;QAClD,MAAM,EAAE,wCAAwC;QAChD,MAAM,EAAE,2CAA2C;KACpD;IACD;QACE,cAAc,EAAE,iBAAiB,CAAC,cAAc;QAChD,MAAM,EAAE,wCAAwC;QAChD,MAAM,EAAE,gDAAgD;KACzD;IACD;QACE,cAAc,EAAE,iBAAiB,CAAC,aAAa;QAC/C,MAAM,EAAE,gCAAgC;QACxC,MAAM,EAAE,mBAAmB;KAC5B;IACD;QACE,cAAc,EAAE,iBAAiB,CAAC,kBAAkB;QACpD,MAAM,EAAE,6CAA6C;QACrD,MAAM,EAAE,kDAAkD;KAC3D;IACD;QACE,cAAc,EAAE,iBAAiB,CAAC,UAAU;QAC5C,MAAM,EAAE,6CAA6C;QACrD,MAAM,EAAE,YAAY;KACrB;IACD;QACE,cAAc,EAAE,iBAAiB,CAAC,gBAAgB;QAClD,MAAM,EAAE,6CAA6C;QACrD,MAAM,EAAE,gDAAgD;KACzD;IACD;QACE,cAAc,EAAE,iBAAiB,CAAC,OAAO;QACzC,MAAM,EAAE,8BAA8B;QACtC,MAAM,EAAE,qBAAqB;KAC9B;CACO,CAAC"}

package/dist/bootstrap/plan-pre-action-bootstrap.d.ts

@@ -6,17 +6,19 @@
  * datastore. Returns a {@link PreActionBootstrapPlan} the hook (or tests)
  * pass to the post-bailout executor.
  */
-import { type LoggerOptions, type ProjectContext, type ToolRegistry } from '@opensip-cli/core';
+import { type LoggerOptions, type ProjectContext } from '@opensip-cli/core';
 import { PRE_ACTION_PHASES } from './pre-action-bootstrap-phases.js';
 import type { loadCliDefaults as loadCliDefaultsFn } from './cli-defaults.js';
+import type { CommandScopeIndex } from '../commands/command-scope-index.js';
 export interface PlanPreActionBootstrapInput {
     readonly opts: Record<string, unknown>;
     readonly cwd: string;
     readonly cwdExplicit: boolean;
     readonly runId: string;
     readonly commandName: string;
+    readonly commandPath: string;
+    readonly commandScopes: CommandScopeIndex;
     readonly explicitConfigPath?: string;
-    readonly tools: ToolRegistry;
 }
 export interface PreActionBootstrapPlan {
     readonly runId: string;
@@ -26,14 +28,12 @@ export interface PreActionBootstrapPlan {
     readonly cliDefaults: ReturnType<typeof loadCliDefaultsFn>;
     readonly project: ProjectContext;
     readonly commandName: string;
-    readonly extraAgnostic: ReadonlySet<string>;
+    readonly commandPath: string;
     readonly jsonOutput: boolean;
     /** Per-run logger options computed after bailouts (ADR-0053). */
     readonly runLoggerOptions: LoggerOptions;
     readonly completedThrough: typeof PRE_ACTION_PHASES.bailoutWindow;
 }
-/** Collect tool CommandSpecs that declare `scope: 'none'` for no-project guard. */
-export declare function collectExtraAgnosticCommands(tools: ToolRegistry): ReadonlySet<string>;
 /**
  * Plan phases 1–4 (read options through bailout window). Throws
  * {@link BootstrapError} on config-resolve or bailout failures.

package/dist/bootstrap/plan-pre-action-bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan-pre-action-bootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap/plan-pre-action-bootstrap.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,YAAY,EAClB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAOrE,OAAO,KAAK,EAAE,eAAe,IAAI,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE9E,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC3D,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5C,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,iEAAiE;IACjE,QAAQ,CAAC,gBAAgB,EAAE,aAAa,CAAC;IACzC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,iBAAiB,CAAC,aAAa,CAAC;CACnE;AAED,mFAAmF;AACnF,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,CAarF;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,2BAA2B,GAAG,sBAAsB,CAsDjG"}
+{"version":3,"file":"plan-pre-action-bootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap/plan-pre-action-bootstrap.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAOrE,OAAO,KAAK,EAAE,eAAe,IAAI,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC3D,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,iEAAiE;IACjE,QAAQ,CAAC,gBAAgB,EAAE,aAAa,CAAC;IACzC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,iBAAiB,CAAC,aAAa,CAAC;CACnE;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,2BAA2B,GAAG,sBAAsB,CA6DjG"}

package/dist/bootstrap/plan-pre-action-bootstrap.js

@@ -12,21 +12,6 @@ import { BootstrapError } from './bootstrap-error.js';
 import { loadCliDefaults, mergeConfigDefaults } from './cli-defaults.js';
 import { PRE_ACTION_PHASES } from './pre-action-bootstrap-phases.js';
 import { checkNoProjectAndBailout, checkSchemaVersionAndBailout, warnAboutPhantomRuntimes, } from './pre-action-guards.js';
-/** Collect tool CommandSpecs that declare `scope: 'none'` for no-project guard. */
-export function collectExtraAgnosticCommands(tools) {
-    const extra = new Set();
-    for (const tool of tools.list()) {
-        for (const c of tool.commands || []) {
-            if (c.scope === 'none') {
-                extra.add(c.name);
-                for (const alias of c.aliases ?? []) {
-                    extra.add(alias);
-                }
-            }
-        }
-    }
-    return extra;
-}
 /**
  * Plan phases 1–4 (read options through bailout window). Throws
  * {@link BootstrapError} on config-resolve or bailout failures.
@@ -35,7 +20,7 @@ export function collectExtraAgnosticCommands(tools) {
  *   guard bails out before project side effects are allowed.
  */
 export function planPreActionBootstrap(input) {
-    const { opts, cwd, cwdExplicit, runId, commandName, tools, explicitConfigPath } = input;
+    const { opts, cwd, cwdExplicit, runId, commandName, commandPath, commandScopes, explicitConfigPath, } = input;
     const cliDefaults = loadCliDefaults(cwd, explicitConfigPath);
     mergeConfigDefaults(opts, cliDefaults);
     let project;
@@ -57,9 +42,8 @@ export function planPreActionBootstrap(input) {
     }
     opts.projectContext = project;
     opts.cwdExplicit = cwdExplicit;
-    const extraAgnostic = collectExtraAgnosticCommands(tools);
     checkSchemaVersionAndBailout(project, runId);
-    checkNoProjectAndBailout(project, cwd, commandName, runId, extraAgnostic);
+    checkNoProjectAndBailout(project, cwd, commandPath, runId, commandScopes);
     warnAboutPhantomRuntimes(project, opts.json === true);
     const runLoggerOptions = {
         silent: true,
@@ -77,7 +61,7 @@ export function planPreActionBootstrap(input) {
         cliDefaults,
         project,
         commandName,
-        extraAgnostic,
+        commandPath,
         jsonOutput: opts.json === true,
         runLoggerOptions,
         completedThrough: PRE_ACTION_PHASES.bailoutWindow,

package/dist/bootstrap/plan-pre-action-bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"plan-pre-action-bootstrap.js","sourceRoot":"","sources":["../../src/bootstrap/plan-pre-action-bootstrap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plan-pre-action-bootstrap.js","sourceRoot":"","sources":["../../src/bootstrap/plan-pre-action-bootstrap.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GAGpB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EACL,wBAAwB,EACxB,4BAA4B,EAC5B,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AA+BhC;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAkC;IACvE,MAAM,EACJ,IAAI,EACJ,GAAG,EACH,WAAW,EACX,KAAK,EACL,WAAW,EACX,WAAW,EACX,aAAa,EACb,kBAAkB,GACnB,GAAG,KAAK,CAAC;IAEV,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAC7D,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEvC,IAAI,OAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,OAAO,GAAG,qBAAqB,CAAC;YAC9B,GAAG;YACH,WAAW;YACX,kBAAkB;SACnB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnE,MAAM,IAAI,cAAc,CAAC;YACvB,OAAO,EAAE,GAAG;YACZ,YAAY,EAAE,KAAK,GAAG,EAAE;YACxB,UAAU,EAAE,uDAAuD;YACnE,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;IAC9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAE/B,4BAA4B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7C,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;IAC1E,wBAAwB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAEtD,MAAM,gBAAgB,GAAkB;QACtC,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;QAC9B,KAAK;QACL,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC;YAChE,CAAC,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;YAC9D,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;IAEF,OAAO;QACL,KAAK;QACL,GAAG;QACH,WAAW;QACX,IAAI;QACJ,WAAW;QACX,OAAO;QACP,WAAW;QACX,WAAW;QACX,UAAU,EAAE,IAAI,CAAC,IAAI,KAAK,IAAI;QAC9B,gBAAgB;QAChB,gBAAgB,EAAE,iBAAiB,CAAC,aAAa;KAClD,CAAC;AACJ,CAAC"}

package/dist/bootstrap/pre-action-guards.d.ts

@@ -10,6 +10,7 @@
  * orchestration sequence and the per-tool `initialize()` lifecycle.
  */
 import { type ProjectContext } from '@opensip-cli/core';
+import type { CommandScopeIndex } from '../commands/command-scope-index.js';
 /**
  * Schema-version bailout. THROWS a {@link BootstrapError} (exit 2) with the
  * "upgrade your CLI" message when the project config declares a schema newer than
@@ -32,7 +33,7 @@ export declare function checkSchemaVersionAndBailout(project: ProjectContext, ru
  * @throws {BootstrapError} (exit 2) when a project-scoped command runs with no
  *   discoverable opensip-cli project (scope === 'none').
  */
-export declare function checkNoProjectAndBailout(project: ProjectContext, cwd: string, cmdName: string, runId: string, extraAgnostic?: ReadonlySet<string>): void;
+export declare function checkNoProjectAndBailout(project: ProjectContext, cwd: string, commandPath: string, runId: string, commandScopes: CommandScopeIndex): void;
 /**
  * Phantom-runtime warning. Detects orphaned opensip-cli/.runtime/
  * subtrees between cwd and the discovered project root — fossils from

package/dist/bootstrap/pre-action-guards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pre-action-guards.d.ts","sourceRoot":"","sources":["../../src/bootstrap/pre-action-guards.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AA+B3B;;;;;;;;;;GAUG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAmCzF;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,WAAW,CAAC,MAAM,CAAa,GAC7C,IAAI,CAgBN;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO,GAAG,IAAI,CAa3F"}
+{"version":3,"file":"pre-action-guards.d.ts","sourceRoot":"","sources":["../../src/bootstrap/pre-action-guards.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAK3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAI5E;;;;;;;;;;GAUG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAmCzF;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,iBAAiB,GAC/B,IAAI,CAeN;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO,GAAG,IAAI,CAa3F"}

package/dist/bootstrap/pre-action-guards.js

@@ -13,29 +13,6 @@ import { checkSchemaCompat, detectPhantomRuntimes, logger, readConfigSchemaVersi
 import { BootstrapError } from './bootstrap-error.js';
 import { formatCliTooOldMessage, formatNoProjectFoundMessage } from './pre-action-messages.js';
 const MODULE_TAG = 'cli:bootstrap';
-/**
- * Commands that operate WITHOUT requiring a project context. These don't
- * read project files or the datastore; running them from a directory
- * with no opensip-cli project is legitimate.
- *
- * Everything else is project-scoped: when `project.scope === 'none'`,
- * the hook emits the "No OpenSIP CLI project found" error and exits 2.
- *
- * Note: `uninstall --user` is project-agnostic, but `uninstall --project`
- * requires one. The check is per-command name here; uninstall's own
- * mode-specific guarding lives in its action body.
- *
- * The base list covers pure host commands. Tool CommandSpecs that declare
- * `scope: 'none'` are added dynamically at runtime (see pre-action-hook)
- * so the declared `CommandSpec.scope` actually controls behavior (previously
- * this list was the only source of truth, making the field dead for tools).
- */
-const PROJECT_AGNOSTIC_COMMANDS = new Set([
-    'init',
-    'configure',
-    'completion',
-    'uninstall',
-]);
 /**
  * Schema-version bailout. THROWS a {@link BootstrapError} (exit 2) with the
  * "upgrade your CLI" message when the project config declares a schema newer than
@@ -94,16 +71,15 @@ export function checkSchemaVersionAndBailout(project, runId) {
  * @throws {BootstrapError} (exit 2) when a project-scoped command runs with no
  *   discoverable opensip-cli project (scope === 'none').
  */
-export function checkNoProjectAndBailout(project, cwd, cmdName, runId, extraAgnostic = new Set()) {
-    const effective = new Set([...PROJECT_AGNOSTIC_COMMANDS, ...extraAgnostic]);
-    if (project.scope !== 'none' || effective.has(cmdName))
+export function checkNoProjectAndBailout(project, cwd, commandPath, runId, commandScopes) {
+    if (project.scope !== 'none' || commandScopes.get(commandPath) === 'none')
         return;
     logger.warn({
         evt: 'cli.project.not-found',
         module: MODULE_TAG,
         runId,
         cwd,
-        command: cmdName,
+        command: commandPath,
     });
     throw new BootstrapError({
         message: `No opensip-cli.config.yml found. Searched from ${cwd} upward.`,

package/dist/bootstrap/pre-action-guards.js.map

@@ -1 +1 @@
-{"version":3,"file":"pre-action-guards.js","sourceRoot":"","sources":["../../src/bootstrap/pre-action-guards.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pre-action-guards.js","sourceRoot":"","sources":["../../src/bootstrap/pre-action-guards.ts"],"names":[],"mappings":"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"}

package/dist/bootstrap/pre-action-hook.d.ts

@@ -6,9 +6,10 @@
  * to Commander's preAction/postAction hooks.
  */
 import type { PreActionRuntime } from './pre-action-runtime.js';
+import type { CommandScopeIndex } from '../commands/command-scope-index.js';
 import type { Command } from 'commander';
 export { resolveOwningTool } from './owning-tool-init.js';
 export type { PreActionRuntime } from './pre-action-runtime.js';
-export declare function installPreActionHook(program: Command, version: string, runtime: PreActionRuntime): void;
+export declare function installPreActionHook(program: Command, version: string, runtime: PreActionRuntime, commandScopes: CommandScopeIndex): void;
 export declare function disposeCurrentScope(): void;
 //# sourceMappingURL=pre-action-hook.d.ts.map

package/dist/bootstrap/pre-action-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pre-action-hook.d.ts","sourceRoot":"","sources":["../../src/bootstrap/pre-action-hook.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AAOH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,gBAAgB,GACxB,IAAI,CAiCN;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAS1C"}
+{"version":3,"file":"pre-action-hook.d.ts","sourceRoot":"","sources":["../../src/bootstrap/pre-action-hook.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AAUH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,iBAAiB,GAC/B,IAAI,CAyCN;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAiB1C"}

package/dist/bootstrap/pre-action-hook.js

@@ -6,13 +6,22 @@
  * {@link executePostBailoutBootstrap} (phases 5–9). This module wires those
  * to Commander's preAction/postAction hooks.
  */
-import { currentScope, generatePrefixedId } from '@opensip-cli/core';
+import { currentScope, exitScope, generatePrefixedId } from '@opensip-cli/core';
+import { commandPath } from '../commands/command-scope-index.js';
+import { hostEnv } from '../env/host-env-specs.js';
 import { executePostBailoutBootstrap } from './execute-post-bailout-bootstrap.js';
 import { planPreActionBootstrap } from './plan-pre-action-bootstrap.js';
 export { resolveOwningTool } from './owning-tool-init.js';
-export function installPreActionHook(program, version, runtime) {
+export function installPreActionHook(program, version, runtime, commandScopes) {
     program.hook('preAction', async (_thisCommand, actionCommand) => {
-        const runId = generatePrefixedId('run');
+        // B1 ("Child runId behavior"): resolve `runId` env-FIRST. A forked/spawned
+        // child re-enters this hook and inherits its parent's run via `OPENSIP_RUN_ID`
+        // (set in the child env by `correlationToEnv`); a top-level invocation, with
+        // no `OPENSIP_RUN_ID` set, mints a fresh id. This is the single inheritance
+        // seam — the spec JSON deliberately never carries `runId`, because the logger
+        // that stamps every worker line is already live before the spec is parsed.
+        const inherited = hostEnv.get('OPENSIP_RUN_ID');
+        const runId = inherited && inherited.length > 0 ? inherited : generatePrefixedId('run');
         const opts = actionCommand.opts();
         const cwd = opts.cwd ?? process.cwd();
         const cwdExplicit = actionCommand.getOptionValueSource('cwd') === 'cli';
@@ -22,8 +31,9 @@ export function installPreActionHook(program, version, runtime) {
             cwdExplicit,
             runId,
             commandName: actionCommand.name(),
+            commandPath: commandPath(actionCommand),
+            commandScopes,
             explicitConfigPath: opts.config,
-            tools: runtime.tools,
         });
         const { scope } = await executePostBailoutBootstrap({
             plan,
@@ -47,5 +57,14 @@ export function disposeCurrentScope() {
     catch {
         // @swallow-ok dispose errors on shutdown; the run has already produced its outcome.
     }
+    finally {
+        // Complete the per-command lifecycle: clear the ambient ALS slot so a
+        // subsequent command in the same process (a long-lived host driving
+        // Commander sequentially) starts with a clean slot and its `enterScope`
+        // does not trip the always-on re-entrancy guard against this finished run.
+        // Production runs one command per process, so this is normally the final
+        // teardown; it is a no-op when no scope is current.
+        exitScope();
+    }
 }
 //# sourceMappingURL=pre-action-hook.js.map

package/dist/bootstrap/pre-action-hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"pre-action-hook.js","sourceRoot":"","sources":["../../src/bootstrap/pre-action-hook.ts"],"names":[],"mappings":"AAAA,qOAAqO;AACrO;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAKxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,MAAM,UAAU,oBAAoB,CAClC,OAAgB,EAChB,OAAe,EACf,OAAyB;IAEzB,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE;QAC9D,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QAClC,MAAM,GAAG,GAAI,IAAI,CAAC,GAAc,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,aAAa,CAAC,oBAAoB,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;QAExE,MAAM,IAAI,GAAG,sBAAsB,CAAC;YAClC,IAAI,EAAE,IAAI;YACV,GAAG;YACH,WAAW;YACX,KAAK;YACL,WAAW,EAAE,aAAa,CAAC,IAAI,EAAE;YACjC,kBAAkB,EAAE,IAAI,CAAC,MAA4B;YACrD,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC;QAEH,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,2BAA2B,CAAC;YAClD,IAAI;YACJ,OAAO;YACP,OAAO;YACP,iIAAiI;YACjI,OAAO,EAAE,aAAa,CAAC,eAAe,EAAE,CAAC,KAAK,KAAK,KAAK;YACxD,MAAM,EAAE,IAAI,CAAC,MAA4B;SAC1C,CAAC,CAAC;QACH,KAAK,CAAC,WAAW,CAAC,KAAK,CACrB,MAAM,EACN,OAAO,EACP,sCAAsC,aAAa,CAAC,IAAI,EAAE,GAAG,CAC9D,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,YAAY,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YACzC,CAAC,CAAC,OAAO,EAAE,CAAC;QACd,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,oFAAoF;IACtF,CAAC;AACH,CAAC"}
+{"version":3,"file":"pre-action-hook.js","sourceRoot":"","sources":["../../src/bootstrap/pre-action-hook.ts"],"names":[],"mappings":"AAAA,qOAAqO;AACrO;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEhF,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAMxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,MAAM,UAAU,oBAAoB,CAClC,OAAgB,EAChB,OAAe,EACf,OAAyB,EACzB,aAAgC;IAEhC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE;QAC9D,2EAA2E;QAC3E,+EAA+E;QAC/E,6EAA6E;QAC7E,4EAA4E;QAC5E,8EAA8E;QAC9E,2EAA2E;QAC3E,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAS,gBAAgB,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACxF,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QAClC,MAAM,GAAG,GAAI,IAAI,CAAC,GAAc,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,aAAa,CAAC,oBAAoB,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;QAExE,MAAM,IAAI,GAAG,sBAAsB,CAAC;YAClC,IAAI,EAAE,IAAI;YACV,GAAG;YACH,WAAW;YACX,KAAK;YACL,WAAW,EAAE,aAAa,CAAC,IAAI,EAAE;YACjC,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC;YACvC,aAAa;YACb,kBAAkB,EAAE,IAAI,CAAC,MAA4B;SACtD,CAAC,CAAC;QAEH,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,2BAA2B,CAAC;YAClD,IAAI;YACJ,OAAO;YACP,OAAO;YACP,iIAAiI;YACjI,OAAO,EAAE,aAAa,CAAC,eAAe,EAAE,CAAC,KAAK,KAAK,KAAK;YACxD,MAAM,EAAE,IAAI,CAAC,MAA4B;SAC1C,CAAC,CAAC;QACH,KAAK,CAAC,WAAW,CAAC,KAAK,CACrB,MAAM,EACN,OAAO,EACP,sCAAsC,aAAa,CAAC,IAAI,EAAE,GAAG,CAC9D,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,YAAY,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YACzC,CAAC,CAAC,OAAO,EAAE,CAAC;QACd,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,oFAAoF;IACtF,CAAC;YAAS,CAAC;QACT,sEAAsE;QACtE,oEAAoE;QACpE,wEAAwE;QACxE,2EAA2E;QAC3E,yEAAyE;QACzE,oDAAoD;QACpD,SAAS,EAAE,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/bootstrap/register-tools-discovery.d.ts

@@ -1,4 +1,41 @@
+/**
+ * register-tools-discovery — installed + authored tool admission and discovery.
+ *
+ * Extracted from register-tools.ts so the bundled registration path stays a
+ * focused module under the file-length soft limit.
+ */
 import { type ToolPluginManifest, type ToolProvenance, type ToolRegistry, type ToolDiscoverySource } from '@opensip-cli/core';
+import { type ToolRuntimeLoad } from './admit-tool-package.js';
+import type { ToolAdmission } from './tool-admission-types.js';
+export type AuthoredAdmission = ToolAdmission;
+/**
+ * Admit or reject a PROJECT-LOCAL authored tool under the deny-by-default trust
+ * policy. The trust decision always precedes module import; a non-allowlisted
+ * tool fails closed before any authored code can run.
+ *
+ * @throws {PluginIncompatibleError} When the sidecar manifest is missing,
+ * malformed, incompatible, or not trusted by the project-tool allowlist.
+ */
+export declare function admitProjectLocalTool(args: {
+    readonly dir: string;
+    readonly env?: NodeJS.ProcessEnv;
+}): AuthoredAdmission;
+/**
+ * Admit a USER-GLOBAL authored tool — trusted-by-default because the user placed
+ * it in their own home-dir tool host, but still fail-closed on a missing or
+ * incompatible manifest.
+ */
+export declare function admitUserGlobalTool(args: {
+    readonly dir: string;
+}): AuthoredAdmission;
+/**
+ * Emit the best-effort stderr line + structured warning for a discovered
+ * INSTALLED tool whose runtime failed to load. Each failure reason maps to its
+ * own diagnostic while preserving the installed leg's skip-not-crash posture.
+ */
+export declare function emitInstalledLoadFailure(name: string, load: Extract<ToolRuntimeLoad, {
+    ok: false;
+}>): void;
 export interface DiscoveryOptions {
     /**
      * Ordered tool-discovery sources (precedence: first wins on duplicate
@@ -47,45 +84,7 @@ export declare function discoverAndRegisterToolPackages(registry: ToolRegistry,
 /**
  * Discover + admit + register AUTHORED Tool sidecars from the two authored
  * roots, then dynamic-import each admitted runtime through the shared
- * `importToolRuntime` seam — the same admit → import → register path the
- * bundled and installed legs travel (ADR-0027; this is the leg that makes the
- * dormant {@link admitProjectLocalTool} live).
- *
- * Two roots, two trust postures:
- *   - **global** (`~/.opensip-cli/tools/`) → {@link admitUserGlobalTool},
- *     trusted-by-default.
- *   - **project** (`<project>/opensip-cli/tools/`) → {@link admitProjectLocalTool},
- *     deny-by-default (allowlist via `OPENSIP_CLI_ALLOW_PROJECT_TOOLS`).
- *
- * Global is processed FIRST so a project-authored tool cannot shadow a same-id
- * global one — matching the `~/.opensip-cli/plugins` precedence note in
- * {@link buildToolDiscoverySources} (first-writer-wins via the registry).
- * `builtInIds` are skipped so an authored tool never shadows a bundled one.
- *
- * **Trust-before-import.** For each candidate, the admit step (which EMBEDS the
- * trust decision — deny-by-default inside `admitProjectLocalTool`) runs to
- * completion BEFORE `importToolRuntime`. A non-allowlisted project tool THROWS
- * `PluginIncompatibleError` (exit 5) here, propagated out of the walk: it must
- * fail the run loudly — that is the clone-protection contract.
- *
- * **Error-posture asymmetry (deliberate).** An un-allowlisted *project* tool is
- * fail-closed by policy (clone-risk; the user must opt in). A *global* tool that
- * fails to load is also fail-closed (the user explicitly authored it into
- * `$HOME`). This differs from the *installed* npm leg, where a stray bad plugin
- * skips-with-diagnostic so it can't take fit/graph/sim down — authored tools are
- * first-party-intent, installed tools are ambient.
- *
- * @param registry The per-invocation tool registry to populate.
- * @param opts.projectAuthoredDir `resolveProjectPaths(root).authoredToolsDir`,
- *   or `undefined` when there is no resolvable project context.
- * @param opts.globalAuthoredDir `resolveUserPaths().authoredToolsDir`.
- * @param opts.env Environment carrying the project allowlist (default
- *   `process.env`); injectable for tests.
- * @param builtInIds Bundled-tool ids to skip on a name collision.
- * @param provenance Sink for admitted authored tools' provenance records.
- * @param manifests Sink for admitted authored tools' manifests (§5.3).
- * @throws {PluginIncompatibleError} for an un-allowlisted project tool, or any
- *   authored tool whose sidecar/runtime is missing/incompatible (fail-closed).
+ * `importToolRuntime` seam.
  */
 export declare function discoverAndRegisterAuthoredTools(registry: ToolRegistry, opts: {
     readonly projectAuthoredDir?: string;

package/dist/bootstrap/register-tools-discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-tools-discovery.d.ts","sourceRoot":"","sources":["../../src/bootstrap/register-tools-discovery.ts"],"names":[],"mappings":"AACA,OAAO,EASL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACzB,MAAM,mBAAmB,CAAC;AAW3B,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAClD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,GACpB,mBAAmB,EAAE,CAqBvB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,gBAAgB,EACtB,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,EAC/B,UAAU,GAAE,cAAc,EAAO,EACjC,SAAS,GAAE,kBAAkB,EAAO,GACnC,OAAO,CAAC,IAAI,CAAC,CAoDf;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE;IACJ,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CAClC,EACD,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,EAC/B,UAAU,GAAE,cAAc,EAAO,EACjC,SAAS,GAAE,kBAAkB,EAAO,GACnC,OAAO,CAAC,IAAI,CAAC,CA0Bf"}
+{"version":3,"file":"register-tools-discovery.d.ts","sourceRoot":"","sources":["../../src/bootstrap/register-tools-discovery.ts"],"names":[],"mappings":"AACA;;;;;GAKG;AAEH,OAAO,EAYL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EAEzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAsC9C;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CAClC,GAAG,iBAAiB,CAgBpB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,iBAAiB,CAErF;AAoCD;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,CAAC,eAAe,EAAE;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC,GAC5C,IAAI,CA0BN;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAClD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,GACpB,mBAAmB,EAAE,CAqBvB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,gBAAgB,EACtB,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,EAC/B,UAAU,GAAE,cAAc,EAAO,EACjC,SAAS,GAAE,kBAAkB,EAAO,GACnC,OAAO,CAAC,IAAI,CAAC,CA2Cf;AAED;;;;GAIG;AACH,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE;IACJ,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CAClC,EACD,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,EAC/B,UAAU,GAAE,cAAc,EAAO,EACjC,SAAS,GAAE,kBAAkB,EAAO,GACnC,OAAO,CAAC,IAAI,CAAC,CAuBf"}