@pleri/olam-cli 0.1.188 → 0.1.195

package/dist/commands/setup-linux-gate.js

@@ -25,9 +25,7 @@ import { detectLinuxGateTrigger } from '@olam/core/src/setup/linux-gate.js';
 export function registerSetupLinuxGate(program) {
     program
         .command('setup-linux-gate-status')
-        .description('Detect whether the Linux platform expansion gate has been triggered. ' +
-        'Checks GitHub issues labeled linux-platform-request and the trust-audit-log ' +
-        'for ≥3 Linux invocations. Outputs JSON.')
+        .description('Check whether the Linux platform expansion gate has been triggered')
         .action(() => {
         try {
             const result = detectLinuxGateTrigger();

package/dist/commands/setup-linux-gate.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-linux-gate.js","sourceRoot":"","sources":["../../src/commands/setup-linux-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,MAAM,UAAU,sBAAsB,CAAC,OAAgB;IACrD,OAAO;SACJ,OAAO,CAAC,yBAAyB,CAAC;SAClC,WAAW,CACV,uEAAuE;QACrE,8EAA8E;QAC9E,yCAAyC,CAC5C;SACA,MAAM,CAAC,GAAG,EAAE;QACX,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,sBAAsB,EAAE,CAAC;YACxC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,UAAU,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAC/D,CAAC;YACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"setup-linux-gate.js","sourceRoot":"","sources":["../../src/commands/setup-linux-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,MAAM,UAAU,sBAAsB,CAAC,OAAgB;IACrD,OAAO;SACJ,OAAO,CAAC,yBAAyB,CAAC;SAClC,WAAW,CAAC,oEAAoE,CAAC;SACjF,MAAM,CAAC,GAAG,EAAE;QACX,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,sBAAsB,EAAE,CAAC;YACxC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,UAAU,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAC/D,CAAC;YACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"setup-metrics.d.ts","sourceRoot":"","sources":["../../src/commands/setup-metrics.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAahD;AAID,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAqB3D"}
+{"version":3,"file":"setup-metrics.d.ts","sourceRoot":"","sources":["../../src/commands/setup-metrics.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAahD;AAID,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkB3D"}

package/dist/commands/setup-metrics.js

@@ -37,8 +37,7 @@ export function parseSinceDate(raw) {
 export function registerSetupMetrics(program) {
     program
         .command('setup-metrics')
-        .description('Query trust-audit-log for olam setup dogfood statistics. ' +
-        'Returns { medianMinutes, p95Minutes, completedCount, abortedCount, ratio }.')
+        .description('Query trust-audit-log for setup dogfood statistics')
         .requiredOption('--since <date>', 'ISO 8601 lower bound (e.g. 2026-05-18)')
         .action((opts) => {
         let since;

package/dist/commands/setup-metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-metrics.js","sourceRoot":"","sources":["../../src/commands/setup-metrics.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,iFAAiF;AAEjF;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,gEAAgE;IAChE,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACvD,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,YAAY;QAC3B,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAEf,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/B,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,0BAA0B,GAAG,iEAAiE,CAC/F,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,iFAAiF;AAEjF,MAAM,UAAU,oBAAoB,CAAC,OAAgB;IACnD,OAAO;SACJ,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CACV,2DAA2D;QACzD,6EAA6E,CAChF;SACA,cAAc,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;SAC1E,MAAM,CAAC,CAAC,IAAuB,EAAE,EAAE;QAClC,IAAI,KAAW,CAAC;QAChB,IAAI,CAAC;YACH,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"setup-metrics.js","sourceRoot":"","sources":["../../src/commands/setup-metrics.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAE9E,iFAAiF;AAEjF;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,gEAAgE;IAChE,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACvD,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,YAAY;QAC3B,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAEf,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/B,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,0BAA0B,GAAG,iEAAiE,CAC/F,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,iFAAiF;AAEjF,MAAM,UAAU,oBAAoB,CAAC,OAAgB;IACnD,OAAO;SACJ,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,oDAAoD,CAAC;SACjE,cAAc,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;SAC1E,MAAM,CAAC,CAAC,IAAuB,EAAE,EAAE;QAClC,IAAI,KAAW,CAAC;QAChB,IAAI,CAAC;YACH,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/commands/setup-phase-5a-skill-source.d.ts

@@ -23,15 +23,22 @@ import type { TrustAuditEntry } from '@olam/core/src/skill-sources/trust-audit-l
 declare const CURATED_SOURCES: readonly [{
     readonly value: "atlas-toolbox";
     readonly name: "atlas-toolbox (recommended)";
-    readonly gitUrl: "https://github.com/grain-tech/atlas-toolbox.git";
+    readonly gitUrl: "git@github.com:atlas-builders/atlas-toolbox.git";
+    readonly branch: "master";
 }, {
     readonly value: "grain-tech/ai-skills";
     readonly name: "grain-tech/ai-skills";
     readonly gitUrl: "https://github.com/grain-tech/ai-skills.git";
+    readonly branch: "main";
 }, {
     readonly value: "custom";
     readonly name: "Custom git URL…";
     readonly gitUrl: null;
+    readonly branch: null;
+}, {
+    readonly value: "skip";
+    readonly name: "Skip for now (configure later via `olam skills source add`)";
+    readonly gitUrl: null;
 }];
 type CuratedValue = (typeof CURATED_SOURCES)[number]['value'];
 export type AddSkillSourceFn = (entry: {
@@ -63,6 +70,15 @@ export type InputPromptFn = (config: {
     message: string;
     validate: (v: string) => boolean | string;
 }) => Promise<string>;
+export type ListSkillSourcesFn = () => readonly SkillSource[];
+/**
+ * Returns the post-setup suggestion block printed when Phase 5a is skipped
+ * (i.e. `--skill-source` was NOT passed).
+ *
+ * Sources URL + branch from CURATED_SOURCES[0] so this stays in lockstep
+ * with what `--skill-source atlas-toolbox` would actually onboard.
+ */
+export declare function formatPostSetupSuggestion(): string;
 export declare function pickSkillSourcePhase(opts: RunSetupOptions, deps: RunSetupDeps): Promise<PhaseResult>;
 export {};
 //# sourceMappingURL=setup-phase-5a-skill-source.d.ts.map

package/dist/commands/setup-phase-5a-skill-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-phase-5a-skill-source.d.ts","sourceRoot":"","sources":["../../src/commands/setup-phase-5a-skill-source.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAIvF,QAAA,MAAM,eAAe;;;;;;;;;;;;EAgBX,CAAC;AAEX,KAAK,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;AAY9D,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,aAAa,CAAC;CACrC,KAAK,WAAW,CAAC;AAElB,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;CACZ,KAAK;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7C,MAAM,MAAM,kBAAkB,GAAG,CAC/B,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,KAC/D,eAAe,CAAC;AAErB,MAAM,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;AAElD,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,CAAC;QAAE,KAAK,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/D,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;AAE5B,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,CAAC;CAC3C,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAqGtB,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,eAAe,EACrB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,WAAW,CAAC,CA2EtB"}
+{"version":3,"file":"setup-phase-5a-skill-source.d.ts","sourceRoot":"","sources":["../../src/commands/setup-phase-5a-skill-source.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAIvF,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;EAwBX,CAAC;AAEX,KAAK,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;AAY9D,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,aAAa,CAAC;CACrC,KAAK,WAAW,CAAC;AAElB,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;CACZ,KAAK;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7C,MAAM,MAAM,kBAAkB,GAAG,CAC/B,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,KAC/D,eAAe,CAAC;AAErB,MAAM,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;AAElD,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,CAAC;QAAE,KAAK,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/D,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;AAE5B,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,CAAC;CAC3C,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEtB,MAAM,MAAM,kBAAkB,GAAG,MAAM,SAAS,WAAW,EAAE,CAAC;AAmH9D;;;;;;GAMG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAsBlD;AAID,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,eAAe,EACrB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,WAAW,CAAC,CA+FtB"}

package/dist/commands/setup-phase-5a-skill-source.js

@@ -23,17 +23,25 @@ const CURATED_SOURCES = [
     {
         value: 'atlas-toolbox',
         name: 'atlas-toolbox (recommended)',
-        gitUrl: 'https://github.com/grain-tech/atlas-toolbox.git',
+        gitUrl: 'git@github.com:atlas-builders/atlas-toolbox.git',
+        branch: 'master',
     },
     {
         value: 'grain-tech/ai-skills',
         name: 'grain-tech/ai-skills',
         gitUrl: 'https://github.com/grain-tech/ai-skills.git',
+        branch: 'main',
     },
     {
         value: 'custom',
         name: 'Custom git URL…',
         gitUrl: null,
+        branch: null,
+    },
+    {
+        value: 'skip',
+        name: 'Skip for now (configure later via `olam skills source add`)',
+        gitUrl: null,
     },
 ];
 const DEFAULT_SOURCE = CURATED_SOURCES[0];
@@ -58,24 +66,28 @@ async function loadRedactUrl() {
     const m = await import('@olam/core/src/skill-sources/index.js');
     return m.redactUrl;
 }
+async function loadListSkillSources() {
+    const m = await import('@olam/core/src/skill-sources/index.js');
+    return m.listSkillSources;
+}
 // ── Resolve deps (injected takes priority; lazy real otherwise) ────────
 async function resolveSkillDeps(deps) {
     const addFn = deps.addSkillSourceFn ?? (await loadAddSkillSource());
     const cloneFn = deps.cloneSkillSourceFn ?? (await loadCloneSkillSource());
     const auditFn = deps.appendTrustAuditFn ?? (await loadAppendTrustAudit());
     const redactFn = deps.redactUrlFn ?? (await loadRedactUrl());
+    const listFn = deps.listSkillSourcesFn ?? (await loadListSkillSources());
     const selectFn = (deps.selectPromptFn ?? select);
     const inputFn = (deps.inputPromptFn ?? input);
-    return { addFn, cloneFn, auditFn, redactFn, selectFn, inputFn };
+    return { addFn, cloneFn, auditFn, redactFn, listFn, selectFn, inputFn };
 }
-// ── Git URL resolution ─────────────────────────────────────────────────
 async function resolveGitUrl(opts, selectFn, inputFn) {
     // Path 2: non-interactive via --skill-source flag
     if (opts.skillSource) {
         const s = opts.skillSource.trim();
         const matched = CURATED_SOURCES.find((c) => c.gitUrl === s || c.value === s);
         if (matched && matched.gitUrl !== null) {
-            return { gitUrl: matched.gitUrl, name: matched.value, trustMethod: 'flag' };
+            return { gitUrl: matched.gitUrl, name: matched.value, branch: matched.branch ?? undefined, trustMethod: 'flag' };
         }
         // CP3 HIGH fix: non-interactive path must validate raw URLs the same way the
         // interactive `input` validator does. Without this, `--skill-source garbage`
@@ -96,6 +108,7 @@ async function resolveGitUrl(opts, selectFn, inputFn) {
         return {
             gitUrl: DEFAULT_SOURCE.gitUrl,
             name: DEFAULT_SOURCE.value,
+            branch: DEFAULT_SOURCE.branch ?? undefined,
             trustMethod: 'interactive',
         };
     }
@@ -103,8 +116,11 @@ async function resolveGitUrl(opts, selectFn, inputFn) {
     const choices = CURATED_SOURCES.map((s) => ({ value: s.value, name: s.name }));
     const picked = await selectFn({ message: 'Pick a skill source to add:', choices });
     const source = CURATED_SOURCES.find((s) => s.value === picked);
+    if (source.value === 'skip') {
+        return { gitUrl: null, name: 'skip', trustMethod: null };
+    }
     if (source.gitUrl !== null) {
-        return { gitUrl: source.gitUrl, name: source.value, trustMethod: 'interactive' };
+        return { gitUrl: source.gitUrl, name: source.value, branch: source.branch ?? undefined, trustMethod: 'interactive' };
     }
     // Custom URL sub-prompt
     const customUrl = await inputFn({
@@ -118,13 +134,55 @@ async function resolveGitUrl(opts, selectFn, inputFn) {
     const urlName = customUrl.split('/').pop()?.replace(/\.git$/, '') ?? 'custom-source';
     return { gitUrl: customUrl, name: urlName, trustMethod: 'interactive' };
 }
+// ── Post-setup suggestion helper ──────────────────────────────────────
+/**
+ * Returns the post-setup suggestion block printed when Phase 5a is skipped
+ * (i.e. `--skill-source` was NOT passed).
+ *
+ * Sources URL + branch from CURATED_SOURCES[0] so this stays in lockstep
+ * with what `--skill-source atlas-toolbox` would actually onboard.
+ */
+export function formatPostSetupSuggestion() {
+    const atlas = CURATED_SOURCES[0];
+    const atlasUrl = atlas.gitUrl;
+    const atlasBranch = atlas.branch;
+    return [
+        '',
+        '─── Optional next step: skill toolkit ───',
+        'The default Atlas skill toolkit ships ~150 slash commands (e.g. /atl:plan-hard,',
+        '/atl:execute, /atl:brainstorm) + agents + hooks via `olam skills sync`.',
+        '',
+        'To install it now:',
+        '',
+        `  olam skills onboard \\`,
+        `    --name atlas-toolbox \\`,
+        `    --git-url ${atlasUrl} \\`,
+        `    --branch ${atlasBranch} \\`,
+        `    --trust \\`,
+        `    --auto-accept-source-prefix`,
+        '',
+        'Skip and decide later — `olam setup` is complete either way.',
+        '',
+    ].join('\n');
+}
 // ── Exported phase function ────────────────────────────────────────────
 export async function pickSkillSourcePhase(opts, deps) {
     // Path 1: skip-on-flag (defensive — caller already short-circuits, but keep idempotent)
     if (opts.skipSkillSource) {
         return { ok: true, skipped: true, message: 'skipped via --skip-skill-source' };
     }
-    const { addFn, cloneFn, auditFn, redactFn, selectFn, inputFn } = await resolveSkillDeps(deps);
+    const { addFn, cloneFn, auditFn, redactFn, listFn, selectFn, inputFn } = await resolveSkillDeps(deps);
+    // Auto-detect: if the operator already has registered skill sources, skip the picker.
+    const existingSources = listFn();
+    if (existingSources.length >= 1) {
+        const names = existingSources.map((s) => s.name).join(', ');
+        process.stdout.write(`[setup] found ${existingSources.length} existing skill source(s): ${names}\n`);
+        return {
+            ok: true,
+            skipped: true,
+            message: `found ${existingSources.length} existing skill source(s) — using existing setup (run \`olam skills source add\` later to add more)`,
+        };
+    }
     let resolved;
     try {
         resolved = await resolveGitUrl(opts, selectFn, inputFn);
@@ -137,11 +195,16 @@ export async function pickSkillSourcePhase(opts, deps) {
             remedy: 'Re-run `olam setup` or use `--skill-source <git-url>` to bypass the picker.',
         };
     }
+    // Operator chose "skip for now"
+    if (resolved.gitUrl === null) {
+        return { ok: true, skipped: true, message: 'skipped by operator — run `olam skills source add` later' };
+    }
     let added;
     try {
         added = addFn({
             name: resolved.name,
             gitUrl: resolved.gitUrl,
+            ...(resolved.branch ? { branch: resolved.branch } : {}),
             trustMethod: resolved.trustMethod,
         });
     }

package/dist/commands/setup-phase-5a-skill-source.js.map

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

package/dist/commands/setup.d.ts

@@ -16,6 +16,7 @@
  *   Phase 2.5: Provision cluster (k3d cluster create olam-dev; k3d updates ~/.kube/config)
  *   Phase 2.6: Pin kubectl context (writes host.kubectl_context_pinned = k3d-olam-dev)
  *   Phase 3:   Bootstrap        (subprocess: olam bootstrap with kubernetes substrate)
+ *   Phase 3.5: K3d HTTPS bootstrap (mkcert install + TLS Secret → Traefik IngressRoute)
  *   …        same as docker thereafter
  *
  * Docker substrate phases (existing compose installs or --substrate=docker):
@@ -24,8 +25,9 @@
  *   Phase 2:   olam CLI sanity  (--version returns)
  *   Phase 2.5: (no-op for docker)
  *   Phase 3:   Bootstrap        (subprocess: olam bootstrap)
+ *   Phase 3.5: (no-op for docker)
  *   Phase 4:   Shell init       (idempotent append of completion eval-line)
- *   Phase 5:   Init project     (offer `olam init` if .olam/config.yaml missing)
+ *   Phase 5:   Init global config (ensure ~/.olam/config.json has host.substrate set)
  *   Phase 5a:  Skill source picker
  *   Phase 5b:  Project sweep
  *   Phase 6:   Auth prompt      (offer interactive `olam auth login`)
@@ -41,6 +43,7 @@
  *   --substrate=<docker|kubernetes>  substrate to target (default: kubernetes; alias k3s→kubernetes)
  *   --cluster-name=<name>            k3d cluster name (default: olam-dev). Useful for operators with
  *                                    pre-existing clusters or running multiple olam stacks side-by-side.
+ *   --skip-https-bootstrap           skip Phase 3.5 (operator manages TLS certs manually)
  *   --skip-shell-init                skip Phase 4 (operator manages shell rc manually)
  *   --skip-auth                      skip Phase 6 (operator will run `olam auth login` later)
  *   --yes / -y                       auto-affirm every prompt (non-interactive)
@@ -89,6 +92,12 @@ export interface RunSetupOptions {
      * Must match DNS-label rules: ^[a-z0-9]([a-z0-9-]*[a-z0-9])?$
      */
     readonly clusterName?: string;
+    /**
+     * Phase 3.5: skip the K3d HTTPS bootstrap (mkcert install + TLS Secret).
+     * Set when the operator manages certs manually or mkcert is not on PATH.
+     * olam services tls-install can still be run later to provision certs.
+     */
+    readonly skipHttpsBootstrap?: boolean;
     /**
      * Phase 7: skip final `olam doctor` verification.
      * Useful in CI where doctor probes expect a fully-wired production stack
@@ -105,6 +114,19 @@ export interface RunSetupOptions {
      * handled by olam setup).
      */
     readonly reuseCluster?: string;
+    /**
+     * DEV-ONLY: mount a local `olam` source checkout into the k3d node at
+     * `/host/olam` so the host-cp deployment's `operator-repo` hostPath
+     * resolves to live source. Regular operators DO NOT set this — the
+     * published image is fully self-contained and degrades gracefully
+     * (`version-status` reports `unknown`, `/api/prs` runs in an empty
+     * cwd). Setting this is strictly for olam maintainers iterating on
+     * host-cp behavior against a running cluster.
+     *
+     * Pair with --substrate=kubernetes. Absolute path required; warning
+     * printed if the path doesn't exist.
+     */
+    readonly hostCpDevPath?: string;
 }
 export type SpawnSubprocess = (cmd: string, args: ReadonlyArray<string>) => Promise<{
     readonly status: number | null;
@@ -126,6 +148,8 @@ export interface RunSetupDeps {
     readonly redactUrlFn?: RedactUrlFn;
     readonly selectPromptFn?: SelectPromptFn;
     readonly inputPromptFn?: InputPromptFn;
+    /** Injectable listSkillSources — returns existing registered sources (used for auto-detect). */
+    readonly listSkillSourcesFn?: () => readonly import('@olam/core/src/skill-sources/schema.js').SkillSource[];
     /**
      * Injectable platform detection.
      * Default: os.platform(). Inject 'darwin' | 'linux' in tests.
@@ -168,6 +192,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 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;
 //# sourceMappingURL=setup.d.ts.map

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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"}