instar 1.3.1252 → 1.3.1254

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

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

package/dist/commands/server.js

@@ -253,6 +253,7 @@ import { UserManager } from '../users/UserManager.js';
 import { loadTestIdentityKey } from '../users/testIdentityMarkers.js';
 import { formatUserContextForSession, hasUserContext } from '../users/UserContextBuilder.js';
 import { SafeFsExecutor } from '../core/SafeFsExecutor.js';
+import { mergeDefaults } from '../core/mergeDefaults.js';
 // setup.ts uses @inquirer/prompts which requires Node 20.12+
 // Dynamic import to avoid breaking the server on older Node versions
 // import { installAutoStart } from './setup.js';
@@ -6516,9 +6517,8 @@ export async function startServer(options) {
                             return computedDefault;
                         // Layer the live in-memory override OVER the computed default.
                         return {
-                            ...computedDefault,
-                            ...live,
-                            categories: { ...computedDefault.categories, ...live.categories },
+                            ...mergeDefaults(computedDefault, live),
+                            categories: mergeDefaults(computedDefault.categories ?? {}, live.categories),
                             ...(live.overrides ? { overrides: live.overrides } : {}),
                             ...(live.failureSwap !== undefined ? { failureSwap: live.failureSwap } : {}),
                         };
@@ -9069,7 +9069,7 @@ export async function startServer(options) {
         const promptRecallCfg = config.promptBuildRecall;
         if (promptRecallCfg?.enabled && semanticMemory) {
             const { PromptBuildRecall, DEFAULT_PROMPT_BUILD_RECALL_CONFIG } = await import('../core/PromptBuildRecall.js');
-            const recall = new PromptBuildRecall({ semanticMemory }, { ...DEFAULT_PROMPT_BUILD_RECALL_CONFIG, ...promptRecallCfg });
+            const recall = new PromptBuildRecall({ semanticMemory }, mergeDefaults(DEFAULT_PROMPT_BUILD_RECALL_CONFIG, promptRecallCfg));
             globalThis.__instarPromptBuildRecall = recall;
             console.log(pc.green('  Pre-prompt memory recall enabled'));
         }
@@ -12778,7 +12778,7 @@ export async function startServer(options) {
             const flush = new PreCompactionFlush({
                 intelligence: sharedIntelligence ?? null,
                 projectDir: config.projectDir,
-            }, { ...DEFAULT_PRE_COMPACTION_FLUSH_CONFIG, ...preCompactFlushCfg });
+            }, mergeDefaults(DEFAULT_PRE_COMPACTION_FLUSH_CONFIG, preCompactFlushCfg));
             hookEventReceiver.on('PreCompact', (payload) => {
                 flush.handle(payload).catch(() => {
                     /* handle() owns its audit; never throws. */
@@ -13514,19 +13514,24 @@ export async function startServer(options) {
         const { PendingLoginStore } = await import('../core/PendingLoginStore.js');
         const { EnrollmentWizard } = await import('../core/EnrollmentWizard.js');
         const { FrameworkLoginDriver, enrollPaneSessionName, enrollmentBrowserEnv, enrollmentIsolationEnv, enrollmentCredentialPath, DEFAULT_ENROLL_LOGIN_COMMANDS } = await import('../core/FrameworkLoginDriver.js');
-        const enrollLoginCommands = {
-            ...DEFAULT_ENROLL_LOGIN_COMMANDS,
-            ...(config.subscriptionPool?.enrollment?.loginCommands ?? {}),
-        };
+        const enrollLoginCommands = mergeDefaults(DEFAULT_ENROLL_LOGIN_COMMANDS, config.subscriptionPool?.enrollment?.loginCommands);
         const pendingLoginStore = new PendingLoginStore({ stateDir: config.stateDir });
         const enrollmentWizard = new EnrollmentWizard({
             store: pendingLoginStore,
             logger: { log: (m) => console.log(m), warn: (m) => console.warn(m) },
             // WS5.2 §5.3/S7 — the follow-me completion gate reads the minted login's account email
-            // from its config-home slot (the Anthropic OAuth profile endpoint) and validates it against
-            // operator expectation before the account is selectable. Same oracle the credential-location
-            // ledger uses; one process-wide oracle keeps identity evidence coherent.
-            oracle: credentialIdentityOracle,
+            // from its config-home slot and validates it against operator expectation before the
+            // account is selectable.
+            //
+            // This MUST be the COMPOSITE oracle. `CredentialIdentityOracle` speaks only the Anthropic
+            // OAuth profile endpoint, so handed a Codex home it returns `unavailable` — the gate then
+            // sees no email and holds every Codex enrollment forever with `missing-completed-email`,
+            // no matter how many times it is retried. That is precisely the failure
+            // CompositeCredentialIdentityOracle was introduced to end (it reads the Codex `auth.json`
+            // id_token locally), but the wizard was never switched over to it. Observed live: a Codex
+            // credential written correctly, `codex login status` reporting logged-in, and the account
+            // still refused registration.
+            oracle: subscriptionIdentityOracle,
             // A HELD follow-me completion (surprise/mismatched/unverifiable email) raises a HIGH
             // attention item for the operator. Map the email-gate's {id,title,body,priority,source}
             // shape onto the telegram attention-queue createAttentionItem shape.
@@ -13600,6 +13605,35 @@ export async function startServer(options) {
                     // source of truth — see there for why a framework with no verified
                     // isolation var gets NONE rather than a misleading one.
                     const isolationEnv = enrollmentIsolationEnv(framework, configHome);
+                    // The per-account config home must EXIST before the login runs. `codex`
+                    // exits immediately when CODEX_HOME points at a missing directory, so a
+                    // first-time enrollment (whose slot has never been created) died in under
+                    // a second and the scraper then watched a dead pane until its timeout,
+                    // reporting the misleading `login artifact not found`. Verified on a live
+                    // machine: same command, missing dir → instant exit; dir created first →
+                    // prints the verification URL + code. Creating it here covers every
+                    // enrollment path because they all spawn through this one callback.
+                    //
+                    // TWO BOUNDS, both deliberate:
+                    //  - Only when this framework HAS an isolation var. `enrollmentIsolationEnv`
+                    //    returns {} for a framework with no verified isolation variable (gemini-cli,
+                    //    pi-cli), whose login writes to the AMBIENT home — creating the allocated
+                    //    slot there would leave a permanently empty directory that never receives a
+                    //    credential. Same principle as the mapping itself: no isolation var, no slot.
+                    //  - Only an ABSOLUTE path. `POST /subscription-pool/enroll` takes `configHome`
+                    //    straight from the request body, so without this the SERVER would recursively
+                    //    create a caller-named relative path against its own cwd. The child CLI might
+                    //    have created that path anyway, but that is the CLI's choice at its own
+                    //    privilege — not the server doing it unconditionally, before anything else
+                    //    validates the value.
+                    if (configHome && Object.keys(isolationEnv).length > 0 && path.isAbsolute(configHome)) {
+                        try {
+                            fs.mkdirSync(configHome, { recursive: true, mode: 0o700 });
+                        }
+                        catch (err) {
+                            throw new Error(`could not create the login config home ${configHome}: ${err instanceof Error ? err.message : String(err)}`);
+                        }
+                    }
                     const env = { ...isolationEnv, ...enrollmentBrowserEnv(openBrowser) };
                     const prefix = Object.entries(env).map(([k, v]) => `${k}=${JSON.stringify(v)}`).join(' ');
                     const cmd = prefix ? `env ${prefix} ${baseCmd}` : baseCmd;
@@ -17612,7 +17646,7 @@ export async function startServer(options) {
                         }
                         : undefined,
                     knownAgentsPath: path.join(config.stateDir, 'threadline', 'known-agents.json'),
-                }, { ...DEFAULT_REDRIVE_CONFIG, ...redriveCfg, enabled: true });
+                }, { ...mergeDefaults(DEFAULT_REDRIVE_CONFIG, redriveCfg), enabled: true });
                 collaborationRedrive.start();
                 globalThis.__instarCollaborationRedrive = collaborationRedrive;
                 console.log(pc.green('  CollaborationRedriveEngine: armed (proactive peer re-drive on counterpart silence)'));
@@ -17666,7 +17700,7 @@ export async function startServer(options) {
                             });
                         }
                         : undefined,
-                }, { ...DEFAULT_A2A_REDELIVERY_CONFIG, ...a2aDelivCfg, enabled: true });
+                }, { ...mergeDefaults(DEFAULT_A2A_REDELIVERY_CONFIG, a2aDelivCfg), enabled: true });
                 a2aRedeliverySentinel.start();
                 globalThis.__instarA2ARedeliverySentinel = a2aRedeliverySentinel;
                 console.log(pc.green('  A2ARedeliverySentinel: armed (A2A redelivery + dark-peer escalation)'));
@@ -23688,8 +23722,8 @@ export async function startServer(options) {
                     // half-configured queue (spec §Config).
                     try {
                         const iqcMod = await import('../core/inboundQueueConfig.js');
-                        const qcfg = { ...iqcMod.DEFAULT_INBOUND_QUEUE_CONFIG, ...(config.multiMachine?.sessionPool?.inboundQueue ?? {}) };
-                        const hcfg = { ...iqcMod.DEFAULT_HOLD_FOR_STABILITY_CONFIG, ...(config.multiMachine?.sessionPool?.holdForStability ?? {}) };
+                        const qcfg = mergeDefaults(iqcMod.DEFAULT_INBOUND_QUEUE_CONFIG, config.multiMachine?.sessionPool?.inboundQueue);
+                        const hcfg = mergeDefaults(iqcMod.DEFAULT_HOLD_FOR_STABILITY_CONFIG, config.multiMachine?.sessionPool?.holdForStability);
                         // Dry-run constructs the engine too (second-pass concern 2): the
                         // §2.4 dry-run branch never takes custody, but its durable
                         // wouldEnqueue/wouldHold/wouldRefuse counters ARE the promotion