@pleri/olam-cli 0.1.195 → 0.1.198

package/dist/commands/setup-phase-8-kg-hook.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Phase 8 — KG hook install (olam setup --continue Phase 8).
+ *
+ * Installs the kg-service PreToolUse hook into `~/.claude/settings.json`
+ * (user scope) so that every new Claude Code session routes grep/find
+ * tool calls through the KG classifier.
+ *
+ * Equivalent to `olam kg install-hook --scope user`. Idempotent: if the
+ * sentinel is already present in ~/.claude/settings.json the phase skips
+ * with a friendly message.
+ *
+ * Dependency injection pattern mirrors setup-phase-5b-project-sweep.ts:
+ *   - real @olam/core functions loaded lazily so this module resolves
+ *     in vitest without a pre-built dist.
+ *   - test callers inject stubs via KgHookPhaseDeps.
+ */
+import type { RunSetupOptions, RunSetupDeps, PhaseResult } from './setup.js';
+/**
+ * Result shape returned by mergeHomeSettingsJson when called with ensureHook.
+ * We re-declare only the `status` field we care about so the phase module
+ * doesn't import the full @olam/core type in prod or test.
+ */
+export interface MergeHookResult {
+    readonly status: 'installed' | 'already-present' | 'no-op';
+}
+export type MergeHookFn = (filePath: string, opts: {
+    ensureHook: {
+        stage: string;
+        sentinel: string;
+        entry: unknown;
+    };
+}) => MergeHookResult;
+export type BuildHookEntryFn = (opts: {
+    flavor: 'host';
+}) => unknown;
+export interface KgHookPhaseDeps {
+    readonly mergeHookFn?: MergeHookFn;
+    readonly buildHookEntryFn?: BuildHookEntryFn;
+    readonly kgHookSentinel?: string;
+    readonly settingsPath?: string;
+    readonly mkdirSync?: (p: string, opts: {
+        recursive: boolean;
+    }) => void;
+    readonly printInfo?: (scope: string, msg: string) => void;
+    readonly printSuccess?: (msg: string) => void;
+}
+export declare function runKgHookPhase(opts: RunSetupOptions, _deps: RunSetupDeps, kgDeps?: KgHookPhaseDeps): Promise<PhaseResult>;
+//# sourceMappingURL=setup-phase-8-kg-hook.d.ts.map

package/dist/commands/setup-phase-8-kg-hook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-phase-8-kg-hook.d.ts","sourceRoot":"","sources":["../../src/commands/setup-phase-8-kg-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAI7E;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,iBAAiB,GAAG,OAAO,CAAC;CAC5D;AAED,MAAM,MAAM,WAAW,GAAG,CACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;IACJ,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,OAAO,CAAC;KAChB,CAAC;CACH,KACE,eAAe,CAAC;AAErB,MAAM,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC;AAErE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IACnC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAC7C,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IACvE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/C;AA2BD,wBAAsB,cAAc,CAClC,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,YAAY,EACnB,MAAM,GAAE,eAAoB,GAC3B,OAAO,CAAC,WAAW,CAAC,CA0DtB"}

package/dist/commands/setup-phase-8-kg-hook.js

@@ -0,0 +1,93 @@
+/**
+ * Phase 8 — KG hook install (olam setup --continue Phase 8).
+ *
+ * Installs the kg-service PreToolUse hook into `~/.claude/settings.json`
+ * (user scope) so that every new Claude Code session routes grep/find
+ * tool calls through the KG classifier.
+ *
+ * Equivalent to `olam kg install-hook --scope user`. Idempotent: if the
+ * sentinel is already present in ~/.claude/settings.json the phase skips
+ * with a friendly message.
+ *
+ * Dependency injection pattern mirrors setup-phase-5b-project-sweep.ts:
+ *   - real @olam/core functions loaded lazily so this module resolves
+ *     in vitest without a pre-built dist.
+ *   - test callers inject stubs via KgHookPhaseDeps.
+ */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as os from 'node:os';
+// ── Lazy real-impl loaders ────────────────────────────────────────────────────
+async function loadMergeHookFn() {
+    const m = await import('@olam/core/src/world/merge-settings.js');
+    return m.mergeHomeSettingsJson;
+}
+async function loadBuildHookEntryFn() {
+    const m = await import('@olam/core/src/kg/hook-template.js');
+    return m.buildHookMatcherEntry;
+}
+async function loadKgHookSentinel() {
+    const m = await import('@olam/core/src/kg/hook-template.js');
+    return m.KG_HOOK_SENTINEL;
+}
+// ── Default settings path (user scope — same as --scope user) ─────────────────
+function defaultSettingsPath() {
+    return path.join(os.homedir(), '.claude', 'settings.json');
+}
+// ── Main export ───────────────────────────────────────────────────────────────
+export async function runKgHookPhase(opts, _deps, kgDeps = {}) {
+    const settingsPath = kgDeps.settingsPath ?? defaultSettingsPath();
+    // Dry-run: describe what would happen without touching disk.
+    if (opts.dryRun) {
+        const printInfo = kgDeps.printInfo ??
+            ((scope, msg) => process.stdout.write(`[${scope}] ${msg}\n`));
+        printInfo('kg-hook', `would install KG hook into ${settingsPath} (dry-run)`);
+        return {
+            ok: true,
+            skipped: true,
+            message: `dry-run: would install KG hook into ${settingsPath}`,
+        };
+    }
+    // Ensure directory exists.
+    const mkdirFn = kgDeps.mkdirSync ?? ((p, o) => fs.mkdirSync(p, o));
+    try {
+        mkdirFn(path.dirname(settingsPath), { recursive: true });
+    }
+    catch (err) {
+        return {
+            ok: false,
+            message: `could not create ${path.dirname(settingsPath)}: ${err instanceof Error ? err.message : String(err)}`,
+            remedy: 'Ensure ~/.claude/ is writable, then re-run `olam setup --continue`.',
+        };
+    }
+    // Load real implementations lazily (injectable for tests).
+    const mergeHookFn = kgDeps.mergeHookFn ?? (await loadMergeHookFn());
+    const buildHookEntryFn = kgDeps.buildHookEntryFn ?? (await loadBuildHookEntryFn());
+    const kgHookSentinel = kgDeps.kgHookSentinel ?? (await loadKgHookSentinel());
+    let result;
+    try {
+        result = mergeHookFn(settingsPath, {
+            ensureHook: {
+                stage: 'PreToolUse',
+                sentinel: kgHookSentinel,
+                entry: buildHookEntryFn({ flavor: 'host' }),
+            },
+        });
+    }
+    catch (err) {
+        return {
+            ok: false,
+            message: `KG hook install failed: ${err instanceof Error ? err.message : String(err)}`,
+            remedy: 'Inspect ~/.claude/settings.json for syntax errors, then re-run `olam setup --continue`.',
+        };
+    }
+    switch (result.status) {
+        case 'installed':
+            return { ok: true, message: `KG hook installed (${settingsPath})` };
+        case 'already-present':
+            return { ok: true, skipped: true, message: 'KG hook already installed — skipped' };
+        case 'no-op':
+            return { ok: true, message: `KG hook: no change to ${settingsPath}` };
+    }
+}
+//# sourceMappingURL=setup-phase-8-kg-hook.js.map

package/dist/commands/setup-phase-8-kg-hook.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-phase-8-kg-hook.js","sourceRoot":"","sources":["../../src/commands/setup-phase-8-kg-hook.ts"],"names":[],"mappings":"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"}

package/dist/commands/setup-phase-9-memory-bridge.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Phase 9 — Agent memory bridge install (olam setup --continue Phase 9).
+ *
+ * Registers `agentmemory` as an MCP server with the operator's host claude
+ * (equivalent to `olam memory install --scope user`). Idempotent: `claude
+ * mcp add` is naturally idempotent — re-running overwrites the registration
+ * but produces exit 0.
+ *
+ * Pre-conditions handled gracefully (not failing the wizard):
+ *   - `claude` not on PATH: phase skips with a remediation hint, not a
+ *     hard failure (operator may not have Claude Code installed on every
+ *     machine — Phase 9 is optional wiring, not a hard install blocker).
+ *   - memory-secret missing: phase skips with a hint to run
+ *     `olam memory start` first; the secret is generated on first start.
+ *
+ * Dependency injection pattern mirrors setup-phase-8-kg-hook.ts:
+ *   - `runInstall` is injectable so tests don't shell out to real claude.
+ *   - printFns injectable so tests can capture output.
+ *
+ * Plan reference: brainstorm docs/brainstorms/2026-05-29-olam-tutorial-mode.md
+ * Layer 1 implementation.
+ */
+import type { RunSetupOptions, RunSetupDeps, PhaseResult } from './setup.js';
+import type { McpScope } from './mcp/install-shared.js';
+import type { ClaudeShellDeps } from './mcp/install-shared.js';
+import type { SecretReader } from './memory/install.js';
+export type RunInstallFn = (opts: {
+    scope: McpScope;
+    readSecret?: SecretReader;
+}, deps?: ClaudeShellDeps) => Promise<number>;
+export interface MemoryBridgePhaseDeps {
+    readonly runInstallFn?: RunInstallFn;
+    readonly printInfo?: (scope: string, msg: string) => void;
+}
+export declare function runMemoryBridgePhase(opts: RunSetupOptions, _deps: RunSetupDeps, bridgeDeps?: MemoryBridgePhaseDeps): Promise<PhaseResult>;
+//# sourceMappingURL=setup-phase-9-memory-bridge.d.ts.map

package/dist/commands/setup-phase-9-memory-bridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-phase-9-memory-bridge.d.ts","sourceRoot":"","sources":["../../src/commands/setup-phase-9-memory-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAIxD,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,UAAU,CAAC,EAAE,YAAY,CAAA;CAAE,EACpD,IAAI,CAAC,EAAE,eAAe,KACnB,OAAO,CAAC,MAAM,CAAC,CAAC;AAErB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3D;AAWD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,YAAY,EACnB,UAAU,GAAE,qBAA0B,GACrC,OAAO,CAAC,WAAW,CAAC,CAqCtB"}

package/dist/commands/setup-phase-9-memory-bridge.js

@@ -0,0 +1,59 @@
+/**
+ * Phase 9 — Agent memory bridge install (olam setup --continue Phase 9).
+ *
+ * Registers `agentmemory` as an MCP server with the operator's host claude
+ * (equivalent to `olam memory install --scope user`). Idempotent: `claude
+ * mcp add` is naturally idempotent — re-running overwrites the registration
+ * but produces exit 0.
+ *
+ * Pre-conditions handled gracefully (not failing the wizard):
+ *   - `claude` not on PATH: phase skips with a remediation hint, not a
+ *     hard failure (operator may not have Claude Code installed on every
+ *     machine — Phase 9 is optional wiring, not a hard install blocker).
+ *   - memory-secret missing: phase skips with a hint to run
+ *     `olam memory start` first; the secret is generated on first start.
+ *
+ * Dependency injection pattern mirrors setup-phase-8-kg-hook.ts:
+ *   - `runInstall` is injectable so tests don't shell out to real claude.
+ *   - printFns injectable so tests can capture output.
+ *
+ * Plan reference: brainstorm docs/brainstorms/2026-05-29-olam-tutorial-mode.md
+ * Layer 1 implementation.
+ */
+// ── Lazy real-impl loader ─────────────────────────────────────────────────────
+async function loadRunInstallFn() {
+    const m = await import('./memory/install.js');
+    return m.runInstall;
+}
+// ── Main export ───────────────────────────────────────────────────────────────
+export async function runMemoryBridgePhase(opts, _deps, bridgeDeps = {}) {
+    // Dry-run: describe what would happen without shelling out to claude.
+    if (opts.dryRun) {
+        const printInfo = bridgeDeps.printInfo ??
+            ((scope, msg) => process.stdout.write(`[${scope}] ${msg}\n`));
+        printInfo('memory-bridge', 'would run `claude mcp add agentmemory --scope user` (dry-run)');
+        return {
+            ok: true,
+            skipped: true,
+            message: 'dry-run: would register agentmemory MCP with claude (--scope user)',
+        };
+    }
+    const runInstallFn = bridgeDeps.runInstallFn ?? (await loadRunInstallFn());
+    const rc = await runInstallFn({ scope: 'user' });
+    if (rc === 0) {
+        return {
+            ok: true,
+            message: 'agentmemory MCP registered with claude (--scope user)',
+        };
+    }
+    // Non-zero rc from runInstall means either:
+    //   rc=1: claude not on PATH, OR secret missing.
+    // Both are soft failures for setup — operator can fix and re-run
+    // `olam setup --continue` or run `olam memory install` manually.
+    return {
+        ok: true,
+        skipped: true,
+        message: `agentmemory MCP registration skipped (rc=${rc}); run \`olam memory install\` after resolving`,
+    };
+}
+//# sourceMappingURL=setup-phase-9-memory-bridge.js.map

package/dist/commands/setup-phase-9-memory-bridge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-phase-9-memory-bridge.js","sourceRoot":"","sources":["../../src/commands/setup-phase-9-memory-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAmBH,iFAAiF;AAEjF,KAAK,UAAU,gBAAgB;IAC7B,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAC9C,OAAO,CAAC,CAAC,UAA0B,CAAC;AACtC,CAAC;AAED,iFAAiF;AAEjF,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAqB,EACrB,KAAmB,EACnB,aAAoC,EAAE;IAEtC,sEAAsE;IACtE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,SAAS,GACb,UAAU,CAAC,SAAS;YACpB,CAAC,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QAChF,SAAS,CACP,eAAe,EACf,+DAA+D,CAChE,CAAC;QACF,OAAO;YACL,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,oEAAoE;SAC9E,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,IAAI,CAAC,MAAM,gBAAgB,EAAE,CAAC,CAAC;IAE3E,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAEjD,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,uDAAuD;SACjE,CAAC;IACJ,CAAC;IAED,4CAA4C;IAC5C,iDAAiD;IACjD,iEAAiE;IACjE,iEAAiE;IACjE,OAAO;QACL,EAAE,EAAE,IAAI;QACR,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,4CAA4C,EAAE,gDAAgD;KACxG,CAAC;AACJ,CAAC"}

package/dist/commands/setup.d.ts

@@ -28,7 +28,7 @@
  *   Phase 3.5: (no-op for docker)
  *   Phase 4:   Shell init       (idempotent append of completion eval-line)
  *   Phase 5:   Init global config (ensure ~/.olam/config.json has host.substrate set)
- *   Phase 5a:  Skill source picker
+ *   Phase 5a:  Skill source picker (runs unconditionally; auto-skips when sources already registered)
  *   Phase 5b:  Project sweep
  *   Phase 6:   Auth prompt      (offer interactive `olam auth login`)
  *   Phase 7:   Final verify     (subprocess: olam doctor; halt on non-zero)
@@ -127,6 +127,38 @@ export interface RunSetupOptions {
      * printed if the path doesn't exist.
      */
     readonly hostCpDevPath?: string;
+    /**
+     * Phase 0: skip the substrate picker (operator manages it manually
+     * via olam config set host.substrate). For non-interactive setups.
+     */
+    readonly skipSubstratePicker?: boolean;
+    /**
+     * --continue: skip Phases 1-7 (assumes initial setup is already complete)
+     * and run ONLY Phase 8 (KG hook) + Phase 9 (memory bridge).
+     *
+     * Use after `olam setup` has run once successfully to add the two optional
+     * integration phases without re-running the full wizard.
+     */
+    readonly continueMode?: boolean;
+    /**
+     * Phase 8: skip KG hook install (operator will run `olam kg install-hook` later).
+     */
+    readonly skipKgHook?: boolean;
+    /**
+     * Phase 9: skip agent memory bridge install (operator will run
+     * `olam memory install` later).
+     */
+    readonly skipMemoryBridge?: boolean;
+    /**
+     * [k3s] Forwarded to `olam bootstrap`: stream all phase output sequentially
+     * instead of collapsing each long phase to a live spinner line.
+     */
+    readonly verbose?: boolean;
+    /**
+     * [k3s] Forwarded to `olam bootstrap`: skip pre-pulling olam-* images into
+     * the k3d node (pods cold-pull on demand).
+     */
+    readonly skipPrepull?: boolean;
 }
 export type SpawnSubprocess = (cmd: string, args: ReadonlyArray<string>) => Promise<{
     readonly status: number | null;
@@ -192,6 +224,7 @@ export interface SetupReport {
 export declare function validateClusterName(name: string): string | null;
 /** Migration hint printed once when an existing docker/compose install is detected. */
 export declare const DOCKER_MIGRATION_HINT: string;
+export declare function phase0SubstratePicker(opts: RunSetupOptions, deps: RunSetupDeps): Promise<PhaseResult>;
 export declare function phase3_5K3dHttpsBootstrap(substrate: SetupSubstrate, opts: RunSetupOptions, _deps: RunSetupDeps): Promise<PhaseResult>;
 export declare function runSetup(opts: RunSetupOptions, deps?: RunSetupDeps): Promise<SetupReport>;
 export declare function registerSetup(program: Command): void;

package/dist/commands/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"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"}