instar 1.3.586 → 1.3.587

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

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAkCH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAS3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AAuBjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAkH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAsBtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC1C,OAAO,CAUT;AAyID,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAg4CD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,YAAY,EAC3B,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,EACzB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EAGvE,UAAU,CAAC,EAAE,MAAM,OAAO,8BAA8B,EAAE,WAAW,GAAG,IAAI,EAK5E,qBAAqB,CAAC,EAAE,MAAM,OAAO,gCAAgC,EAAE,kBAAkB,GAAG,IAAI,EAKhG,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,GACpD,IAAI,CA8eN;AA2lBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA20ctE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAkCH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAS3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AAuBjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAkH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAsBtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC1C,OAAO,CAUT;AAyID,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAg4CD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,YAAY,EAC3B,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,EACzB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EAGvE,UAAU,CAAC,EAAE,MAAM,OAAO,8BAA8B,EAAE,WAAW,GAAG,IAAI,EAK5E,qBAAqB,CAAC,EAAE,MAAM,OAAO,gCAAgC,EAAE,kBAAkB,GAAG,IAAI,EAKhG,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,GACpD,IAAI,CA8eN;AA2lBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA04ctE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}

package/dist/commands/server.js

@@ -4372,43 +4372,96 @@ export async function startServer(options) {
                 const { IntelligenceRouter } = await import('../core/IntelligenceRouter.js');
                 const { buildIntelligenceProvider: buildIP } = await import('../core/intelligenceProviderFactory.js');
                 const { LlmCircuitBreaker } = await import('../core/LlmCircuitBreaker.js');
+                const { INTERNAL_FRAMEWORK_PREFERENCE, resolveInternalFrameworkDefault, } = await import('../core/internalFrameworkDefault.js');
                 const defaultFw = resolvedFramework;
                 const rawDefault = sharedIntelligence;
+                // Build a non-default framework's provider (its OWN breaker → a Claude trip
+                // can't pause Codex). claude-code builds inherit subscription-path routing so a
+                // component routed to Claude under a codex default still honors June-15 routing.
+                const buildFrameworkProvider = (fw) => buildIP({
+                    framework: fw,
+                    breaker: new LlmCircuitBreaker(),
+                    // The per-component routing path is the one the cartographer sweep actually
+                    // uses — the kill-switch must reach it too.
+                    ...(fw === 'codex-cli' && resolveCodexExecJson ? { resolveExecJson: resolveCodexExecJson } : {}),
+                    ...(fw === 'claude-code' && subscriptionPathOption
+                        ? { subscriptionPath: subscriptionPathOption }
+                        : {}),
+                    // pi-cli routing (PI-HARNESS-INTEGRATION-SPEC §4.4): thread the configured
+                    // model pattern + the explicit Anthropic override. Absent pattern ⇒ the
+                    // factory degrades to null (guarded by design).
+                    ...(fw === 'pi-cli'
+                        ? {
+                            ...(config.sessions?.frameworkDefaultModels?.['pi-cli']
+                                ? { piModel: config.sessions.frameworkDefaultModels['pi-cli'] }
+                                : {}),
+                            ...(config.sessions?.piCliAllowAnthropicProviders !== undefined
+                                ? { piAllowAnthropicProviders: config.sessions.piCliAllowAnthropicProviders }
+                                : {}),
+                        }
+                        : {}),
+                });
+                const probeCache = new Map();
+                const cachedBuild = (fw) => {
+                    if (probeCache.has(fw))
+                        return probeCache.get(fw);
+                    let p = null;
+                    try {
+                        p = buildFrameworkProvider(fw);
+                    }
+                    catch {
+                        p = null;
+                    }
+                    probeCache.set(fw, p);
+                    return p;
+                };
+                // §4.2 active-provider filtering: the active-set is the preference chain
+                // filtered to frameworks whose provider genuinely BUILDS on this machine
+                // (`buildProvider(fw) !== null` — the router's own truth, not a bare `which`).
+                // claude-code is the default framework (always "active" — buildIP not needed),
+                // so it's never dropped from the tail; off-default frameworks are probed.
+                // Memoize ONLY this SET (§4.6 — never a frozen config object). Machine-local
+                // by design (§5): each machine probes its own installed CLIs.
+                const activeFrameworkSet = INTERNAL_FRAMEWORK_PREFERENCE.filter((fw) => fw === defaultFw || cachedBuild(fw) !== null);
+                // §4.4 boot snapshot — load-bearing & mutation-proof: capture WHETHER the
+                // operator set componentFrameworks ONCE here, at construction, BEFORE the only
+                // runtime mutator (CartographerSweep auto-vivify, ~server.ts:11266). If we
+                // tested the live object later, we'd mistake the auto-vivified block for an
+                // operator override and silently disable the default policy (round-1 M5).
+                const operatorSetComponentFrameworks = config.sessions?.componentFrameworks !== undefined;
+                const computedDefault = resolveInternalFrameworkDefault(activeFrameworkSet);
                 sharedIntelligence = new IntelligenceRouter({
                     defaultProvider: rawDefault,
                     defaultFramework: defaultFw,
-                    // Live read: each call sees the current config object's componentFrameworks
-                    // (a config edit that mutates the in-memory object is hot; a file reload is
-                    // out of B1 scope — same semantics as the rest of instar's config).
-                    resolveConfig: () => config.sessions?.componentFrameworks,
-                    // Each non-default framework gets its OWN breaker → a Claude trip can't
-                    // pause Codex (the whole point). Default framework keeps the shared one.
-                    // claude-code builds inherit the subscription-path routing so a
-                    // component routed to Claude under a codex default still honors
-                    // the June-15 SDK-pot-vs-subscription decision.
-                    buildProvider: (fw) => buildIP({
-                        framework: fw,
-                        breaker: new LlmCircuitBreaker(),
-                        // The per-component routing path is the one the cartographer
-                        // sweep actually uses — the kill-switch must reach it too.
-                        ...(fw === 'codex-cli' && resolveCodexExecJson ? { resolveExecJson: resolveCodexExecJson } : {}),
-                        ...(fw === 'claude-code' && subscriptionPathOption
-                            ? { subscriptionPath: subscriptionPathOption }
-                            : {}),
-                        // pi-cli routing (PI-HARNESS-INTEGRATION-SPEC §4.4): thread the
-                        // configured model pattern + the explicit Anthropic override.
-                        // Absent pattern ⇒ the factory degrades to null (guarded by design).
-                        ...(fw === 'pi-cli'
-                            ? {
-                                ...(config.sessions?.frameworkDefaultModels?.['pi-cli']
-                                    ? { piModel: config.sessions.frameworkDefaultModels['pi-cli'] }
-                                    : {}),
-                                ...(config.sessions?.piCliAllowAnthropicProviders !== undefined
-                                    ? { piAllowAnthropicProviders: config.sessions.piCliAllowAnthropicProviders }
-                                    : {}),
-                            }
-                            : {}),
-                    }),
+                    // §4.6 live-read, layered resolveConfig:
+                    //  - operator-set at boot → return the LIVE operator block unchanged (live
+                    //    edits to its contents flow through; today's behavior).
+                    //  - else → the computed default LAYERED UNDER any live in-memory override
+                    //    (e.g. CartographerSweep's runtime-injected categories/overrides WIN for
+                    //    their slot — this layering is what stops a frozen default from silently
+                    //    disabling the freshness sweep, round-3 R3-2). Reads live every call;
+                    //    memoizes only the active-SET, never a frozen config object.
+                    resolveConfig: () => {
+                        const live = config.sessions?.componentFrameworks;
+                        if (operatorSetComponentFrameworks)
+                            return live;
+                        if (!live)
+                            return computedDefault;
+                        // Layer the live in-memory override OVER the computed default.
+                        return {
+                            ...computedDefault,
+                            ...live,
+                            categories: { ...computedDefault.categories, ...live.categories },
+                            ...(live.overrides ? { overrides: live.overrides } : {}),
+                            ...(live.failureSwap !== undefined ? { failureSwap: live.failureSwap } : {}),
+                        };
+                    },
+                    // §4.5: per-attempt swap timeout, inline-defaulted to 5s (no ConfigDefaults
+                    // entry — codexExecJson precedent; absent ⇒ 5s, present ⇒ operator's value).
+                    swapAttemptTimeoutMs: config.intelligence?.swapAttemptTimeoutMs ?? 5000,
+                    // Each non-default framework gets its OWN breaker (built once, from the
+                    // shared probe-cache so the active-set probe doesn't double-build).
+                    buildProvider: (fw) => cachedBuild(fw),
                     onDegrade: (info) => {
                         try {
                             DegradationReporter.getInstance().report({