@north-light/crouter 0.3.316 → 0.3.318

package/dist/core/__tests__/fixtures/fake-engine.d.ts

@@ -298,14 +298,15 @@ interface FakeServices {
     resourceLoader: ResourceLoader;
     modelRuntime: FakeModelRuntime;
 }
+type FakeResourceLoaderOptions = {
+    additionalExtensionPaths?: string[];
+    appendSystemPrompt?: string[];
+};
 export declare function createAgentSessionServices(options: {
     cwd: string;
     agentDir?: string;
     modelRuntime?: unknown;
-    resourceLoaderOptions?: {
-        additionalExtensionPaths?: string[];
-        appendSystemPrompt?: string[];
-    };
+    resourceLoaderOptions?: FakeResourceLoaderOptions;
 }): Promise<FakeServices>;
 export declare function createAgentSessionFromServices(options: {
     services: FakeServices;

package/dist/core/__tests__/fixtures/fake-engine.js

@@ -31,11 +31,12 @@
 //   <nodeDir>/fake-pi.dialog.jsonl   — one line per resolved unattended dialog (§5.4)
 import { spawn } from 'node:child_process';
 import { writeFileSync, readFileSync, existsSync, mkdirSync, appendFileSync, unlinkSync, } from 'node:fs';
-import { join, dirname } from 'node:path';
+import { join, dirname, resolve } from 'node:path';
 import { randomUUID } from 'node:crypto';
-import { DefaultResourceLoader, getAgentDir } from '@earendil-works/pi-coding-agent';
+import { DefaultPackageManager, DefaultResourceLoader, getAgentDir, SettingsManager } from '@earendil-works/pi-coding-agent';
 import { MANAGED_PROVIDER_COOLING_DIAGNOSTIC } from '../../runtime/managed-provider-cooling.js';
 import { PROVIDER_FAILURE_DIAGNOSTIC } from '../../provider-failure.js';
+import { CANVAS_EXTENSIONS } from '../../runtime/canvas-extensions.js';
 import registerCanvasBashValve, { createValveOperations } from '../../../pi-extensions/canvas-bash-valve.js';
 /** Test seams for prompt-scoped failures before session_start. The one-shot
  *  variant records its first failure per node so the next cycling retry can
@@ -678,6 +679,14 @@ class FakeSession {
         // A turn consumes whatever was queued for it, as the real session does.
         this.steering.length = 0;
         this.followUps.length = 0;
+        let releaseGate;
+        if (process.env['PI_FAKE_ENGINE_HOLD_TURN'] === '1') {
+            let release;
+            let resolveSettled;
+            const settled = new Promise((resolve) => { resolveSettled = resolve; });
+            releaseGate = new Promise((resolve) => { release = resolve; });
+            this.heldTurn = { release, settled, resolveSettled };
+        }
         this.streaming = true;
         if (opts.runHooks === true) {
             await this.fire('agent_start', {}, this.buildCtx());
@@ -685,14 +694,7 @@ class FakeSession {
         this.emit({ type: 'agent_start' });
         this.emit({ type: 'turn_start' });
         this.emit({ type: 'message_start', message: small });
-        if (process.env['PI_FAKE_ENGINE_HOLD_TURN'] === '1') {
-            let release;
-            let resolveSettled;
-            const settled = new Promise((resolve) => { resolveSettled = resolve; });
-            const releaseGate = new Promise((resolve) => { release = resolve; });
-            this.heldTurn = { release, settled, resolveSettled };
-            await releaseGate;
-        }
+        await releaseGate;
         // F2 (message_update coalescing): the broker now coalesces message_update
         // relays (latest-wins, ~75 ms window), so a padded flood riding message_update
         // can no longer climb a stalled viewer's backlog — the coalescer would shed
@@ -1291,14 +1293,93 @@ const FAKE_REGISTERED_MODELS = [
     { provider: 'openai-codex', id: 'gpt-5.6-luna' },
     FAKE_AVAILABLE_MODEL,
 ];
+/** Source harnesses use native imports only for an isolated, mandatory-only
+ * canvas fixture. Every other source stays on the SDK file-loader path. */
+async function sourceCanvasExtensionLoaderOptions(cwd, agentDir, options) {
+    const extensionPaths = options?.additionalExtensionPaths;
+    const mandatoryOnly = extensionPaths?.length === CANVAS_EXTENSIONS.length
+        && extensionPaths.every((path, index) => path === CANVAS_EXTENSIONS[index]);
+    if (!import.meta.url.endsWith('.ts') || !mandatoryOnly)
+        return { additionalExtensionPaths: extensionPaths };
+    const settingsManager = SettingsManager.create(cwd, agentDir);
+    const resolved = await new DefaultPackageManager({ cwd, agentDir, settingsManager }).resolve();
+    if (resolved.extensions.some((extension) => extension.enabled)) {
+        return { additionalExtensionPaths: extensionPaths, settingsManager };
+    }
+    const inlinePaths = new Map();
+    const fileLoaderErrors = new Map();
+    const missingPaths = [];
+    const extensionFactories = [];
+    for (const inputPath of extensionPaths) {
+        const path = resolve(cwd, inputPath);
+        if (!existsSync(path)) {
+            missingPaths.push(path);
+            continue;
+        }
+        inlinePaths.set(`<inline:${path}>`, path);
+        let factory;
+        try {
+            const loaded = await import(path);
+            if (typeof loaded.default !== 'function') {
+                fileLoaderErrors.set(path, `Extension does not export a valid factory function: ${path}`);
+                factory = () => { throw new Error(fileLoaderErrors.get(path)); };
+            }
+            else {
+                factory = loaded.default;
+            }
+        }
+        catch {
+            // Let the original loader produce its own import/transform diagnostic.
+            return { additionalExtensionPaths: extensionPaths, settingsManager };
+        }
+        extensionFactories.push({ name: path, factory });
+    }
+    return {
+        additionalExtensionPaths: [],
+        extensionFactories,
+        settingsManager,
+        restoreCliExtensionMetadata: (loader) => {
+            const result = loader.getExtensions();
+            for (const extension of result.extensions) {
+                const path = inlinePaths.get(extension.path);
+                if (path === undefined)
+                    continue;
+                const sourceInfo = { path, source: 'cli', scope: 'temporary', origin: 'top-level', baseDir: undefined };
+                extension.path = path;
+                extension.resolvedPath = path;
+                extension.sourceInfo = sourceInfo;
+                for (const command of extension.commands.values())
+                    command.sourceInfo = sourceInfo;
+                for (const tool of extension.tools.values())
+                    tool.sourceInfo = sourceInfo;
+            }
+            for (const error of result.errors) {
+                const path = inlinePaths.get(error.path);
+                if (path !== undefined) {
+                    error.path = path;
+                    const isConflict = /^(?:Tool|Flag) ".*" conflicts with /.test(error.error);
+                    error.error = fileLoaderErrors.get(path) ?? (isConflict ? error.error : `Failed to load extension: ${error.error}`);
+                }
+                for (const [inlinePath, filePath] of inlinePaths) {
+                    error.error = error.error.replaceAll(inlinePath, filePath);
+                }
+            }
+            result.errors.push(...missingPaths.map((path) => ({ path, error: `Extension path does not exist: ${path}` })));
+        },
+    };
+}
 export async function createAgentSessionServices(options) {
+    const agentDir = options.agentDir ?? getAgentDir();
+    const extensionOptions = await sourceCanvasExtensionLoaderOptions(options.cwd, agentDir, options.resourceLoaderOptions);
+    const { restoreCliExtensionMetadata, ...loaderOptions } = extensionOptions;
     const loader = new DefaultResourceLoader({
         cwd: options.cwd,
-        agentDir: options.agentDir ?? getAgentDir(),
-        additionalExtensionPaths: options.resourceLoaderOptions?.additionalExtensionPaths,
+        agentDir,
+        ...loaderOptions,
         appendSystemPrompt: options.resourceLoaderOptions?.appendSystemPrompt,
     });
     await loader.reload();
+    restoreCliExtensionMetadata?.(loader);
     // Zero-auth test seam. While <CRTR_HOME>/fake-pi.no-auth exists, the registry
     // reports a GENUINE zero-auth boot (nothing registered, nothing authenticated)
     // so resolveLaunchModel (broker.ts) falls all the way to a tier-3 model-less

package/dist/core/__tests__/seam/broker-provider-retry.test.js

@@ -367,6 +367,8 @@ test('reload_auth re-drives a parked fatal provider-auth turn exactly once', { t
     await seedPool('openai-codex', false);
     const child = await h.spawnHeadlessChild(parent, 'auth reload child', { model: OPENAI_STRONG.spec });
     await h.waitFor(() => agentStartCount(child) >= 1, { label: 'initial auth fixture turn started' });
+    const kickoffObserver = await attachUntil(child, 'observer', 'auth-reload-kickoff-settled', (a) => a.welcome.snapshot.state.isStreaming === false, 'auth reload kickoff settled');
+    kickoffObserver.close();
     const baselineStarts = agentStartCount(child);
     h.fakeCmd(child, {
         cmd: 'stop',
@@ -397,6 +399,8 @@ test('reload_auth leaves a parked auth fault with its original session when navi
     await seedPool('openai-codex', false);
     const child = await h.spawnHeadlessChild(parent, 'auth replacement child', { model: OPENAI_STRONG.spec });
     await h.waitFor(() => agentStartCount(child) >= 1, { label: 'initial replacement fixture turn started' });
+    const kickoffObserver = await attachUntil(child, 'observer', 'auth-replacement-kickoff-settled', (a) => a.welcome.snapshot.state.isStreaming === false, 'auth replacement kickoff settled');
+    kickoffObserver.close();
     h.fakeCmd(child, {
         cmd: 'stop',
         reason: 'error',

package/dist/core/runtime/warm-pool.d.ts

@@ -31,11 +31,12 @@ export interface WarmRequest {
 }
 /** Claim a spare for `request`, reshaped onto its persona — or null when the
  *  pool cannot serve it. The caller falls back to a cold spawn; a refused
- *  create hook leaves the spare untouched and rejects the create. */
+ *  create hook leaves the spare untouched and rejects the create. `beforeClaimDelivery`
+ *  persists birth state before the claimant's first session message can arrive. */
 export declare function claimWarmNode(request: WarmRequest, birth?: {
     deadlineAt?: string;
     outcomeDelivery?: OutcomeDeliveryBinding;
-}): Promise<string | null>;
+}, beforeClaimDelivery?: (nodeId: string) => void): Promise<string | null>;
 /** Return every spare that is no longer worth its broker: one whose engine is
  *  confirmed GONE (the common case — a daemon handover tears down every broker
  *  of its epoch and nothing resumes a spare), one whose row left `active`/`idle`,

package/dist/core/runtime/warm-pool.js

@@ -112,8 +112,9 @@ async function resolveRecipe(request) {
 }
 /** Claim a spare for `request`, reshaped onto its persona — or null when the
  *  pool cannot serve it. The caller falls back to a cold spawn; a refused
- *  create hook leaves the spare untouched and rejects the create. */
-export async function claimWarmNode(request, birth = {}) {
+ *  create hook leaves the spare untouched and rejects the create. `beforeClaimDelivery`
+ *  persists birth state before the claimant's first session message can arrive. */
+export async function claimWarmNode(request, birth = {}, beforeClaimDelivery) {
     const recipe = await resolveRecipe(request);
     if (warmSpareCount(recipe.key) === 0)
         return null;
@@ -156,6 +157,15 @@ export async function claimWarmNode(request, birth = {}) {
         persona_ack: { kind: request.kind, mode: request.mode, lifecycle: 'resident' },
         ...(request.model !== null ? { model_override: request.model } : {}),
     });
+    // Persist any caller-owned birth state before the first claimant delivery.
+    // A spare has no claimant turn yet, but this keeps claimed and cold roots on
+    // the same durable-before-observable boundary.
+    try {
+        beforeClaimDelivery?.(nodeId);
+    }
+    catch (err) {
+        return abandonSpare(nodeId, 'birth preparation', err);
+    }
     // Bearings FIRST, before any other delivery: a spare mints without them (see
     // canvas-context-intro.ts), so this is the node's orienting frame and it must
     // land as the session's first entry. Built from the row we just reshaped, so

package/dist/daemon/api/__tests__/node-create-description.test.js

@@ -2,6 +2,8 @@ import { after, before, test } from 'node:test';
 import assert from 'node:assert/strict';
 import { createServer } from 'node:net';
 import { mkdtempSync, rmSync } from 'node:fs';
+import { readOutputRequest } from '../../../core/runtime/structured-output.js';
+import { structuredOutputPromptBlock } from '../../../pi-extensions/canvas-structured-output.js';
 import { join } from 'node:path';
 import { closeDb, migrate, openDb } from '../../../core/canvas/db.js';
 import { closeScopedStores } from '../../../core/scoped-state/db.js';
@@ -20,6 +22,7 @@ let originalCanvasHome;
 let originalUserHome;
 let originalLaunch;
 const brokers = [];
+const firstRunPrompts = new Map();
 before(() => {
     originalCanvasHome = process.env['CRTR_HOME'];
     originalUserHome = process.env['HOME'];
@@ -34,6 +37,10 @@ before(() => {
     bindTestFleet();
     originalLaunch = headlessBrokerHost.launch;
     headlessBrokerHost.launch = (nodeId) => {
+        const outputRequest = readOutputRequest(nodeId);
+        if (outputRequest.state === 'valid') {
+            firstRunPrompts.set(nodeId, structuredOutputPromptBlock(outputRequest.request));
+        }
         const broker = createServer();
         brokers.push(broker);
         broker.listen(join(nodeDir(nodeId), 'view.sock'));
@@ -70,6 +77,19 @@ function context(method, path, id, body) {
         body,
     };
 }
+test('root create writes its output schema before the first broker run', async () => {
+    const created = await handleCreate(context('POST', '/v1/nodes', undefined, {
+        kind: 'general',
+        root: true,
+        profile: null,
+        cwd: home,
+        prompt: 'Return the structured result.',
+        output_schema: JSON.stringify({ type: 'object', properties: { verdict: { type: 'string' } }, required: ['verdict'] }),
+    }));
+    const nodeId = created.body.node_id;
+    assert.match(firstRunPrompts.get(nodeId) ?? '', /<structured-output-request>/);
+    assert.match(firstRunPrompts.get(nodeId) ?? '', /"verdict"/);
+});
 test('node create stores caller description and automatic naming leaves it and name unchanged', async () => {
     const created = await handleCreate(context('POST', '/v1/nodes', undefined, {
         kind: 'general',

package/dist/daemon/api/handlers/nodes.js

@@ -299,11 +299,9 @@ export async function handleCreate(ctx, deps = {}) {
             const claimed = await claimWarmNode(warm, {
                 ...(deadline === undefined ? {} : { deadlineAt: deadline }),
                 ...(resolvedOutcomeDelivery === undefined ? {} : { outcomeDelivery: resolvedOutcomeDelivery }),
-            });
+            }, schema === null ? undefined : (nodeId) => writeOutputSchema(nodeId, 'terminal', schema));
             if (claimed !== null) {
                 refillWarmPool(warm);
-                if (schema !== null)
-                    writeOutputSchema(claimed, 'terminal', schema);
                 return { status: 201, body: detailOf(claimed) };
             }
             warmRefill = warm;
@@ -314,12 +312,10 @@ export async function handleCreate(ctx, deps = {}) {
         if (resolvedOutcomeDelivery !== undefined)
             recipe.outcomeDelivery = resolvedOutcomeDelivery;
         recipe.readiness = req.root === true ? 'await' : 'launch';
-        const result = await spawnChildPrepared(recipe, undefined, () => {
+        const result = await spawnChildPrepared(recipe, schema === null ? undefined : (nodeId) => writeOutputSchema(nodeId, 'terminal', schema), () => {
             if (warmRefill !== null)
                 refillWarmPool(warmRefill);
         });
-        if (schema !== null)
-            writeOutputSchema(result.node.node_id, 'terminal', schema);
         return { status: 201, body: detailOf(result.node.node_id) };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.316",
+  "version": "0.3.318",
   "description": "crtr — agent runtime with memory, plugins, and marketplaces",
   "type": "module",
   "main": "dist/index.js",
@@ -92,7 +92,7 @@
     "link": "npm link",
     "prepublishOnly": "npm run build",
     "test": "CRTR_NO_DAEMON_AUTOSTART=1 node --conditions=crtr-src --import tsx/esm --import ./scripts/test-env-scrub.mjs --test --test-force-exit --test-concurrency=$(node -p 'Math.max(4, require(`node:os`).availableParallelism() - 1)') --test-timeout=10000 'src/**/__tests__/*.test.ts'",
-    "test:integration": "CRTR_NO_DAEMON_AUTOSTART=1 node --conditions=crtr-src --import tsx/esm --import ./scripts/test-env-scrub.mjs --test --test-concurrency=$(node -p 'Math.min(8, Math.max(2, require(`node:os`).availableParallelism() - 1))') --test-timeout=60000 'src/**/__tests__/integration/*.test.ts'",
+    "test:integration": "npm run build:api && CRTR_NO_DAEMON_AUTOSTART=1 node --conditions=crtr-src --import tsx/esm --import ./scripts/test-env-scrub.mjs --test --test-concurrency=$(node -p 'Math.min(8, Math.max(2, require(`node:os`).availableParallelism() - 1))') --test-timeout=60000 'src/**/__tests__/integration/*.test.ts' 'packages/crouter-sdk/src/**/__tests__/integration/*.test.ts'",
     "test:seam": "npm run build && npm run test:seam:built",
     "test:seam:built": "CRTR_NO_DAEMON_AUTOSTART=1 node --import ./scripts/test-env-scrub.mjs --test --test-concurrency=$(node -p 'Math.min(4, Math.max(2, require(`node:os`).availableParallelism() - 2))') --test-timeout=180000 'dist/**/__tests__/seam/*.test.js'",
     "test:all": "npm test && npm run test:integration && npm run test:seam"

package/runtime.lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.316",
+  "version": "0.3.318",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/crouter",
-      "version": "0.3.316",
+      "version": "0.3.318",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
@@ -5206,17 +5206,17 @@
     },
     "packages/crouter-api": {
       "name": "@north-light/crouter-api",
-      "version": "0.3.316",
+      "version": "0.3.318",
       "license": "UNLICENSED"
     },
     "packages/crouter-env-docker": {
       "name": "@north-light/crouter-env-docker",
-      "version": "0.3.316",
+      "version": "0.3.318",
       "license": "UNLICENSED"
     },
     "packages/crouter-sdk": {
       "name": "@north-light/crouter-sdk",
-      "version": "0.3.316",
+      "version": "0.3.318",
       "license": "UNLICENSED",
       "dependencies": {
         "@north-light/crouter-api": "^0.3.295"