@plurnk/plurnk-service 1.10.1 → 1.12.0

package/dist/digest/digest.sql

@@ -17,7 +17,7 @@ SELECT * FROM workspaces ORDER BY id;
 SELECT * FROM workers ORDER BY id;
 
 -- PREP: digest_loops
-SELECT id, worker_id, sequence, status, prompt, flags, terminated_by, terminal_result
+SELECT id, worker_id, sequence, status, prompt, policy, terminated_by, terminal_result
 FROM loops ORDER BY worker_id, sequence;
 
 -- PREP: digest_turns
@@ -26,30 +26,48 @@ SELECT id, loop_id, sequence, producer, kind, status, completed_at, packet,
 FROM turns ORDER BY loop_id, sequence;
 
 -- PREP: digest_turn_attempts
-SELECT a.id, mc.id AS model_call_id, mc.turn_id, mc.sequence, mc.kind,
-       mc.state, a.accepted, mc.response, mc.failure,
-       a.parse_errors, mc.attributions,
-       mc.finish_reason, mc.model, mc.timestamp, mc.completed_at
+SELECT a.id, mc.id AS model_call_id, ic.turn_id, ic.sequence, ic.kind,
+       ic.state, a.accepted, mc.response, mc.failure,
+       a.parse_errors, ic.attributions,
+       mc.finish_reason, COALESCE(mc.response_model, ic.request_model) AS model,
+       ic.request_model, mc.response_model, ic.timestamp, ic.completed_at
 FROM turn_attempts a
 JOIN model_calls mc ON mc.id = a.model_call_id
-ORDER BY mc.turn_id, mc.sequence;
+JOIN inference_calls ic ON ic.id = mc.id
+ORDER BY ic.turn_id, ic.sequence;
+
+-- PREP: digest_inference_calls
+SELECT id, workspace_id, turn_id, sequence, kind, state, attributions,
+       request_model, timestamp, completed_at
+FROM inference_calls
+ORDER BY workspace_id, timestamp, id;
 
 -- PREP: digest_model_calls
-SELECT mc.id, mc.turn_id, mc.sequence, mc.kind, mc.state,
-       mc.response, mc.failure, mc.attributions,
-       mc.finish_reason, mc.model, mc.timestamp, mc.completed_at,
+SELECT mc.id, ic.workspace_id, ic.turn_id, ic.sequence, ic.kind, ic.state,
+       mc.response, mc.failure, mc.capacity, ic.attributions,
+       mc.finish_reason, COALESCE(mc.response_model, ic.request_model) AS model,
+       ic.request_model, mc.response_model, ic.timestamp, ic.completed_at,
        a.id AS turn_attempt_id, a.accepted, a.parse_errors,
        le.id AS log_entry_id
 FROM model_calls mc
+JOIN inference_calls ic ON ic.id = mc.id
 LEFT JOIN turn_attempts a ON a.model_call_id = mc.id
 LEFT JOIN log_entries le ON le.model_call_id = mc.id
-ORDER BY mc.turn_id, mc.sequence;
+ORDER BY ic.workspace_id, ic.timestamp, ic.id;
+
+-- PREP: digest_embedding_calls
+SELECT ec.id, ic.workspace_id, ic.turn_id, ic.sequence, ic.kind, ic.state,
+       ic.request_model AS model, ec.input_count, ec.output_count,
+       ec.metadata, ec.failure, ic.timestamp, ic.completed_at
+FROM embedding_calls ec
+JOIN inference_calls ic ON ic.id = ec.id
+ORDER BY ic.workspace_id, ic.timestamp, ic.id;
 
 -- PREP: digest_provider_requests
 -- Cardinal physical-request ledger with ownership coordinates for derived
 -- workspace/worker/loop/turn projections.
-SELECT pr.id, pr.model_call_id, a.id AS turn_attempt_id, mc.kind,
-       mc.turn_id, t.loop_id, l.worker_id, w.workspace_id,
+SELECT pr.id, pr.inference_call_id, a.id AS turn_attempt_id, ic.kind,
+       ic.turn_id, t.loop_id, l.worker_id, ic.workspace_id,
        pr.sequence, pr.provider, pr.model, pr.state, pr.outcome, pr.status,
        pr.usage_input, pr.usage_output, pr.usage_total,
        pr.usage_input_no_cache, pr.usage_input_cache_read, pr.usage_input_cache_write,
@@ -57,20 +75,30 @@ SELECT pr.id, pr.model_call_id, a.id AS turn_attempt_id, mc.kind,
        pr.cost_kind, pr.cost_amount, pr.cost_currency, pr.cost_usd_equivalent,
        pr.cost_source, pr.cost_reason, pr.started_at, pr.completed_at
 FROM provider_requests pr
-JOIN model_calls mc ON mc.id = pr.model_call_id
-LEFT JOIN turn_attempts a ON a.model_call_id = mc.id
-JOIN turns t ON t.id = mc.turn_id
-JOIN loops l ON l.id = t.loop_id
-JOIN workers w ON w.id = l.worker_id
-ORDER BY w.id, l.sequence, t.sequence, mc.sequence, pr.sequence;
+JOIN inference_calls ic ON ic.id = pr.inference_call_id
+LEFT JOIN turn_attempts a ON a.model_call_id = ic.id
+LEFT JOIN turns t ON t.id = ic.turn_id
+LEFT JOIN loops l ON l.id = t.loop_id
+LEFT JOIN workers w ON w.id = l.worker_id
+ORDER BY ic.workspace_id, ic.timestamp, ic.id, pr.sequence;
 
 -- PREP: digest_log_entries
 SELECT id, worker_id, loop_id, turn_id, sequence, at, origin, source, model_call_id,
        op, delimiter, signal,
        scheme, hostname, port, pathname, query, fragment,
        rx, status_rx, mimetype_rx,
-       state, outcome, attrs
-FROM log_entries ORDER BY loop_id, turn_id, sequence;
+       state, outcome, attrs, initial_folded,
+       projection.active AS projection_active,
+       projection.folded AS projection_folded,
+       COALESCE((
+           SELECT json_group_array(ordered.tag)
+           FROM (
+               SELECT tag FROM log_tags WHERE log_entry_id = le.id ORDER BY tag
+           ) ordered
+       ), '[]') AS tags
+FROM log_entries le
+JOIN log_entry_projections projection ON projection.log_entry_id = le.id
+ORDER BY loop_id, turn_id, sequence;
 
 -- PREP: digest_worker_rollups
 -- Structural per-worker aggregates. Accounting is derived through the shared

package/dist/index.js

@@ -14,7 +14,7 @@ export { default as Exec } from "./schemes/Exec.js";
 export { default as File } from "./schemes/File.js";
 export { Mock } from "@plurnk/plurnk-providers";
 // Package-relative paths to non-code artifacts (migrations, the upstream
-// grammar's plurnk.md, default requirements). Resolution lives in the
+// grammar's plurnk.md, default Recap). Resolution lives in the
 // Paths class so this entry stays a pure re-export barrel.
 export { default as Paths } from "./Paths.js";
 // CLI-flag derivation from .env.defaults (PLURNK_X → --x, the comment above

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,8EAA8E;AAC9E,mEAAmE;AAEnE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,0BAA0B,CAAC;AACrE,4EAA4E;AAC5E,+CAA+C;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAShD,yEAAyE;AACzE,sEAAsE;AACtE,2DAA2D;AAC3D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,YAAY,CAAC;AAE9C,4EAA4E;AAC5E,8EAA8E;AAC9E,sEAAsE;AACtE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,8EAA8E;AAC9E,mEAAmE;AAEnE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,0BAA0B,CAAC;AACrE,4EAA4E;AAC5E,+CAA+C;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAShD,yEAAyE;AACzE,+DAA+D;AAC/D,2DAA2D;AAC3D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,YAAY,CAAC;AAE9C,4EAA4E;AAC5E,8EAA8E;AAC9E,sEAAsE;AACtE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/schemes/Exec.d.ts

@@ -6,7 +6,7 @@ import type { FindResult } from "./_entry-find.ts";
 import { CoreSchemeAdapterBase } from "../core/CoreSchemeServices.ts";
 import type { CoreSchemeCallContext } from "../core/CoreSchemeServices.ts";
 import { type SchemeResultBase } from "../core/results.ts";
-import { type EntryAddress } from "@plurnk/plurnk-schemes";
+import { type EntryAddress, type ProposalApplyRequest } from "@plurnk/plurnk-schemes";
 type ExecResult = SchemeResultBase & {
     body?: string;
     attrs?: object;
@@ -22,6 +22,7 @@ export type WebFetch = (url: string, opts?: {
 }) => Promise<WebFetchResult | null>;
 export default class Exec extends CoreSchemeAdapterBase {
     #private;
+    static sourceRecovery(source: string, upstream: unknown): string;
     static manifest: SchemeManifest;
     constructor(fetchWeb?: WebFetch);
     idle(): Promise<void>;
@@ -31,12 +32,10 @@ export default class Exec extends CoreSchemeAdapterBase {
     hasActiveHoldSpawns(workerId: number, holdSet: ReadonlySet<string>): boolean;
     kill(pathname: string, signal: number | null, ctx: CoreSchemeCallContext, scheme?: string): Promise<SchemeResultBase>;
     exec(statement: ExecStatement, ctx: CoreSchemeCallContext): Promise<ExecResult>;
-    applyResolution(args: {
-        attrs: object;
-        body?: string;
-    }, ctx: CoreSchemeCallContext): Promise<SchemeResultBase & {
+    applyResolution(args: ProposalApplyRequest, ctx: CoreSchemeCallContext): Promise<SchemeResultBase & {
         outcome?: string;
         body?: string;
+        result?: object;
     }>;
     resolveEntryAddress(target: ParsedPath, ctx: CoreSchemeCallContext): Promise<EntryAddress | SchemeResultBase | null>;
     find(statement: FindStatement, ctx: CoreSchemeCallContext): Promise<FindResult>;

package/dist/schemes/Exec.d.ts.map

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

package/dist/schemes/Exec.js

@@ -1,7 +1,5 @@
 import { parsePath, PathSyntax, TagSignal } from "@plurnk/plurnk-contracts";
-import { Policy } from "@plurnk/plurnk-execs";
 import { WebFetcher, WebMaterializationError, } from "@plurnk/plurnk-schemes-http";
-import WorkspaceSettings from "../core/workspace-settings.js";
 import EffectPolicy from "./EffectPolicy.js";
 import EntryCrud from "./_entry-crud.js";
 import Owner from "../core/Owner.js";
@@ -16,7 +14,7 @@ import { isAbsolute, join, resolve } from "node:path";
 import { CoreSchemeAdapterBase } from "../core/CoreSchemeServices.js";
 import ErrorDetail from "../core/ErrorDetail.js";
 import Results, { OperationFailureError } from "../core/results.js";
-import { InvalidOperationResultError, NetworkAddress } from "@plurnk/plurnk-schemes";
+import { InvalidOperationResultError, NetworkAddress, } from "@plurnk/plurnk-schemes";
 import DbProjectionCaps from "../core/caps/DbProjectionCaps.js";
 import WorkerControlAddress from "../core/WorkerControlAddress.js";
 import Turn from "../core/Turn.js";
@@ -24,6 +22,7 @@ import LoopLifecycle from "../core/LoopLifecycle.js";
 import LogEntryProjection from "../core/LogEntryProjection.js";
 import LogBody from "../core/LogBody.js";
 import { setTimeout as delay } from "node:timers/promises";
+import ExecScheduler from "./ExecScheduler.js";
 // Executors are discovered + probed at boot into ExecutorRegistry and reach
 // the scheme through ctx.executors ({§exec-registry-resolves}). Each runtime tag
 // resolves to its sibling executor; the scheme itself stays runtime-agnostic.
@@ -70,8 +69,8 @@ const coordinateFromPathname = (pathname) => {
 // rides the owner_id column, never the pathname). Empty authority = the CALLING worker — your own
 // streams need no qualifier, so a fan-out sibling's identical coordinate can never be yours
 // ({§stream-owner-scoped}).
-// A named authority = that worker's streams, ancestry-gated (reader must be the owner or an
-// ancestor); an unknown name or unpermitted reader resolves null → the face 404s, no existence leak.
+// A named authority = that worker's streams, any worker of the workspace (#394); an unknown
+// name resolves null → the face 404s.
 export const resolveStreamStatement = async (statement, ctx) => {
     const t = statement.target;
     const hostname = t !== null && t.kind === "url" ? t.hostname : null;
@@ -83,6 +82,12 @@ export const resolveStreamStatement = async (statement, ctx) => {
     return { statement: { ...statement, target: { ...t, hostname: null } }, ownerId };
 };
 export default class Exec extends CoreSchemeAdapterBase {
+    // The slot contract, stated when a resource source cannot be read: the resource IS the
+    // program and the body its stdin; a command belongs beneath a targetless heading.
+    static sourceRecovery(source, upstream) {
+        const contract = `\`## EXEC0 (${source})\` runs that resource as the program (its content is the program; the body is its stdin). To run a command in the workspace, write it beneath a targetless \`## EXEC0\`.`;
+        return typeof upstream === "string" && upstream.length > 0 ? `${contract} ${upstream}` : contract;
+    }
     static manifest = {
         name: "exec",
         authority: "owner",
@@ -94,16 +99,15 @@ export default class Exec extends CoreSchemeAdapterBase {
         writableBy: ["model", "client"],
         volatile: true,
         modelVisible: true,
-        documentation: "Runs a registered executable tool — `## EXEC0 [executor] (target) <timeout,poll>\nbody` — using its `worker://~/_plurnk/tools/` invocation contract. Output streams into the worker's `<executor>:///<loop>/<turn>/<seq>` entry on that tool's own channels. A host-effecting invocation proposes for review before it runs; a read-only or pure one runs ungated. Either way you never fetch the output: the engine surfaces each turn's new stream bytes automatically — folded while it runs, opened when it finishes.",
-        flags: {
-            excludedInAsk: true,
-        },
+        documentation: "Runs a registered executable tool — `## EXEC0 [executor] (target) <timeout minutes,poll minutes>\nbody` — using its `worker://~/_plurnk/tools/` invocation contract. Output streams into the worker's `<executor>:///<loop>/<turn>/<seq>` entry on that tool's own channels. A host-effecting invocation proposes for review before it runs; a read-only or pure one runs ungated. Either way you never fetch the output: the engine surfaces each turn's new stream bytes automatically — folded while it runs, opened when it finishes.",
     };
     // The web-fetch the entry sink calls on content:null ({§exec-entry-sink}).
     // Default = schemes-http's checked WebFetcher; injectable for tests.
     #fetchWeb;
+    #scheduler;
     constructor(fetchWeb) {
         super();
+        this.#scheduler = new ExecScheduler();
         if (fetchWeb === undefined) {
             const webFetcher = new WebFetcher();
             this.#fetchWeb = (url, opts) => webFetcher.fetch(url, opts);
@@ -213,38 +217,13 @@ export default class Exec extends CoreSchemeAdapterBase {
         const runtime = requested === "" ? "sh" : requested; // empty signal = default shell
         if (core.executors === undefined)
             throw new Error("exec dispatched without an executor registry");
-        const workspaceExecs = (await WorkspaceSettings.read(core.db, core.workspaceId)).execs;
         // {§exec-registry-resolves} — a non-empty tag selects exactly one registered executable
         // tool. Unknown tags are not reinterpreted as shell command words: that would make the
         // executed command differ from the authored body. Bare EXEC remains the default-shell form.
         const resolved = core.executors.entry(runtime, core.functionalityWorkerId);
         if (resolved === undefined) {
-            const available = core.executors.availableRuntimes(core.functionalityWorkerId)
-                .filter((tag) => workspaceExecs === null || Policy.isEnabled(tag, workspaceExecs));
             return Results.failure("scheme:exec", "runtime-not-registered", 501, `Executable tool '${runtime}' is not registered for this worker.`, {}, {
                 requestedRuntime: runtime,
-                availableRuntimes: available,
-                ...(available.length > 0
-                    ? {
-                        recovery: available.includes("sh")
-                            ? `Use bare EXEC for a shell command or select a registered executable tool: ${available.join(", ")}.`
-                            : `Select a registered executable tool: ${available.join(", ")}.`,
-                    }
-                    : {}),
-                retryable: false,
-            });
-        }
-        // {§operator-config-workspace-execs} — the workspace layer only narrows
-        // the registered set. Bare EXEC resolves to sh before the same gate.
-        if (workspaceExecs !== null && !Policy.isEnabled(runtime, workspaceExecs)) {
-            const available = core.executors.availableRuntimes(core.functionalityWorkerId)
-                .filter((tag) => Policy.isEnabled(tag, workspaceExecs));
-            return Results.failure("scheme:exec", "runtime-disabled", 501, `Executable tool '${runtime}' is disabled by workspace policy.`, {}, {
-                requestedRuntime: runtime,
-                availableRuntimes: available,
-                recovery: available.length > 0
-                    ? `Use an enabled executable tool: ${available.join(", ")}.`
-                    : "Continue without executing a tool in this workspace.",
                 retryable: false,
             });
         }
@@ -264,10 +243,10 @@ export default class Exec extends CoreSchemeAdapterBase {
                 ? `Executable tool family '${runtime}' requires one registered tool target.`
                 : `Executable tool family '${runtime}' has no registered target '${exactTarget}'.`, {}, {
                 runtime,
-                availableTargets,
-                recovery: availableTargets.length > 0
-                    ? `Select one registered target: ${availableTargets.join(", ")}.`
-                    : `Continue without executing '${runtime}'; it has no enabled targets.`,
+                availableTargetCount: availableTargets.length,
+                ...(availableTargets.length === 0 ? {} : {
+                    recovery: `Select a target documented under worker://~/_plurnk/tools/${runtime}/.`,
+                }),
                 retryable: false,
             });
         }
@@ -336,7 +315,17 @@ export default class Exec extends CoreSchemeAdapterBase {
                     console.error(`EXEC target classification failed for '${inspected}':`, cause);
                     return Results.failure("scheme:exec", "target-classification-failed", 500, `EXEC target '${target}' could not be inspected: ${ErrorDetail.preview(cause)}`, {}, { target, stage: "target-classification" });
                 }
-                return refuse("target-not-found", `Looked for a directory or script named \`${target}\` under ${runRoot} and found neither.`, "A target is a cwd, a script, or a tool name — never a command. A command belongs in the body: `## EXEC0 (.)` with the command as the body.", { target, root: runRoot });
+                // The target is not a script here, but it may be a registered tool of another
+                // runtime — say so first; that is what exists (#388).
+                const executors = core.executors;
+                const ownerRuntimes = executors === undefined
+                    ? []
+                    : executors.availableRuntimes(core.functionalityWorkerId)
+                        .filter((tag) => executors.toolRegistry(tag, core.functionalityWorkerId)?.tools.some((tool) => tool.target === target) === true);
+                const recovery = ownerRuntimes.length === 0
+                    ? "Use an existing directory or script as the target, or place a shell command beneath targetless `## EXEC0`."
+                    : `Run the registered tool with \`## EXEC0 [${ownerRuntimes[0]}] (${target})\`.`;
+                return refuse("target-not-found", "The EXEC target does not resolve as a directory, script, or registered tool for this runtime.", recovery, { target, ...(ownerRuntimes.length === 0 ? {} : { toolRuntimes: ownerRuntimes }) });
             }
         }
         if (!hasBody && target === null && resourceSource === null) {
@@ -352,14 +341,14 @@ export default class Exec extends CoreSchemeAdapterBase {
         // <turn_seq>/<sequence> (executor-domain + coordinate, e.g. sh/1/1/2).
         // `pathname` is stamped into attrs at log-write time; applyResolution
         // reads it back here.
-        // EXEC repurposes the `<L>` slot as `<timeout, poll>` (seconds): mark[0] caps the spawn's
+        // EXEC repurposes the `<L>` slot as `<timeout, poll>` (MINUTES, held in seconds): mark[0] caps the spawn's
         // lifetime, mark[1] sets the hibernation poll-wake cadence ({§exec-poll}). N>0 → deadline (504);
         // -1 / absent → unbounded (loop-life bounded); 0 → turn-scoped (reaped at the next pre-turn,
         // never surviving into the subsequent turn).
         const marks = statement.lineMarker?.marks;
-        const timeoutSec = typeof marks?.[0] === "number" && marks[0] > 0 ? Math.floor(marks[0]) : undefined;
+        const timeoutSec = typeof marks?.[0] === "number" && marks[0] > 0 ? Math.floor(marks[0]) * 60 : undefined;
         const turnScoped = typeof marks?.[0] === "number" && marks[0] === 0;
-        const pollSec = typeof marks?.[1] === "number" && marks[1] >= 0 ? Math.floor(marks[1]) : undefined;
+        const pollSec = typeof marks?.[1] === "number" && marks[1] >= 0 ? Math.floor(marks[1]) * 60 : undefined;
         const attrs = {
             runtime, cwd, body, target, pathname: "", effect,
             ...(resourceSource !== null ? { resourceSource } : {}),
@@ -400,18 +389,20 @@ export default class Exec extends CoreSchemeAdapterBase {
                 annotation: null,
                 signal: null,
                 target: sourceTarget,
+                metadata: args.metadata === null ? null : [...args.metadata],
                 lineMarker: { marks: [1, -1] },
                 body: null,
                 position: { line: 0, column: 0 },
             }, core);
             if (read.status >= 400) {
-                // A missing scheme source is usually a tool call written as an address
-                // (`## EXEC0 (pm:///…)`): name the form that works.
-                const problem = read.problem;
-                const recovered = read.status === 404 && problem !== undefined && !("recovery" in problem)
-                    ? { ...problem, recovery: `\`${sourceTarget.scheme}:///…\` is an entry address, not a tool. A tool call names its runtime in brackets and the tool name in parens — \`## EXEC0 [${sourceTarget.scheme}] (<tool>)\`; a shell command belongs in the body of a bare \`## EXEC0 (.)\`.` }
-                    : problem;
-                return Results.assert({ ...read, ...(recovered === undefined ? {} : { problem: recovered }), outcome: "scheme_source_read_failed" });
+                // {§exec-target-routing} — the failure stays the owning READ's (#163); the EXEC
+                // contract rides its recovery, because a stream address in the target slot is
+                // almost always a command that belonged beneath a targetless heading (#425 F4).
+                const problem = read.problem === undefined ? undefined : {
+                    ...read.problem,
+                    recovery: Exec.sourceRecovery(attrs.resourceSource, read.problem.recovery),
+                };
+                return Results.assert({ ...read, outcome: "scheme_source_read_failed", ...(problem === undefined ? {} : { problem }) });
             }
             const content = read.content;
             if (typeof content !== "string") {
@@ -489,11 +480,19 @@ export default class Exec extends CoreSchemeAdapterBase {
         this.liveSubscriptions().register(subscriptionId, {
             cancel: () => controller.abort(ExecAbort.teardownReason()),
         });
-        const tail = this.#runExecutor({
-            executor: resolved.executor,
-            runtime, body, cwd, target, ctx: core, pathname,
-            entryId, subscriptionId, signal: controller.signal, controller, tempPath,
-            timeoutSec: typeof attrs.timeoutSec === "number" ? attrs.timeoutSec : null,
+        const admission = this.#scheduler.admit(core.workspaceId, controller.signal);
+        const tail = admission.ready.then(async (release) => {
+            try {
+                return await this.#runExecutor({
+                    executor: resolved.executor,
+                    runtime, body, cwd, target, ctx: core, pathname,
+                    entryId, subscriptionId, signal: controller.signal, controller, tempPath,
+                    timeoutSec: typeof attrs.timeoutSec === "number" ? attrs.timeoutSec : null,
+                });
+            }
+            finally {
+                release();
+            }
         });
         // Every exec backgrounds + streams ({§exec-stream}): no same-turn receipt — the output
         // surfaces as the environment-observation injector's delta on the next turn (folded while
@@ -501,7 +500,16 @@ export default class Exec extends CoreSchemeAdapterBase {
         // from the preserved effect fact; they resolve a turn later, uniformly
         // with host streams.
         this.#activeSpawns.set(subscriptionId, tail);
-        return { status: 200, outcome: "started" };
+        return admission.queued
+            ? {
+                status: 202,
+                outcome: "queued",
+                result: {
+                    executionsAhead: admission.executionsAhead,
+                    concurrency: admission.concurrency,
+                },
+            }
+            : { status: 200, outcome: "started" };
     }
     // Bridge the executor's sink-style contract (write/setState/emit)
     // onto plurnk-service's storage primitives (appendToChannel,
@@ -695,6 +703,7 @@ export default class Exec extends CoreSchemeAdapterBase {
                     // Durable provenance for clients/forensics. This is machine
                     // ambience, not a human/model action waterfall item.
                     attrs,
+                    initial_folded: "[]",
                 });
                 if (logRow === undefined)
                     throw new Error("entry(): log insert returned no row");
@@ -708,57 +717,65 @@ export default class Exec extends CoreSchemeAdapterBase {
         };
         const executionFailures = [];
         try {
-            try {
-                const reported = await executor.run({
-                    runtime, body, cwd, target, signal,
-                    entry: entrySink,
-                    interact: (request) => {
-                        if (ctx.requestInteraction === undefined) {
-                            throw new Error("EXEC client interaction capability is unavailable.");
-                        }
-                        return ctx.requestInteraction(request);
-                    },
-                    env: ExecEnv.scoped(), // SPEC {§exec} {§exec-env-scoped} — never plurnk's own secrets
-                    write: (channel, chunk, mimetype) => enqueue(() => ChannelWrite.appendToChannel(db, {
-                        entryId, channel, chunk, mimetype, notify: ctx.streamEventNotify, coordinate,
-                    })),
-                    setState: (channel, state) => enqueue(() => ChannelWrite.setChannelState(db, {
-                        entryId, channel, state, notify: ctx.streamEventNotify, coordinate,
-                    })),
-                    emit: (event) => ctx.pushNotice?.(event),
+            if (signal.aborted) {
+                result = Results.failure("scheme:exec", "execution-cancelled", 499, `Execution of '${runtime}' was cancelled by the service.`, {}, {
+                    runtime,
+                    stage: "execution",
+                    retryable: false,
                 });
-                // Drain the queue so the subscription doesn't close before
-                // final chunk events / state transitions have committed.
-                await queue;
+            }
+            else
                 try {
-                    result = Results.assert(reported);
+                    const reported = await executor.run({
+                        runtime, body, cwd, target, signal,
+                        entry: entrySink,
+                        interact: (request) => {
+                            if (ctx.requestInteraction === undefined) {
+                                throw new Error("EXEC client interaction capability is unavailable.");
+                            }
+                            return ctx.requestInteraction(request);
+                        },
+                        env: ExecEnv.scoped(), // SPEC {§exec} {§exec-env-scoped} — never plurnk's own secrets
+                        write: (channel, chunk, mimetype) => enqueue(() => ChannelWrite.appendToChannel(db, {
+                            entryId, channel, chunk, mimetype, notify: ctx.streamEventNotify, coordinate,
+                        })),
+                        setState: (channel, state) => enqueue(() => ChannelWrite.setChannelState(db, {
+                            entryId, channel, state, notify: ctx.streamEventNotify, coordinate,
+                        })),
+                        emit: (event) => ctx.pushNotice?.(event),
+                    });
+                    // Drain the queue so the subscription doesn't close before
+                    // final chunk events / state transitions have committed.
+                    await queue;
+                    try {
+                        result = Results.assert(reported);
+                    }
+                    catch (cause) {
+                        console.error(`Executor '${runtime}' returned an invalid operation result:`, cause);
+                        result = Results.failure("scheme:exec", "executor-invalid-result", 500, `The '${runtime}' executor returned an invalid operation result.`, {}, {
+                            runtime,
+                            stage: "result-validation",
+                            retryable: false,
+                        });
+                    }
                 }
                 catch (cause) {
-                    console.error(`Executor '${runtime}' returned an invalid operation result:`, cause);
-                    result = Results.failure("scheme:exec", "executor-invalid-result", 500, `The '${runtime}' executor returned an invalid operation result.`, {}, {
+                    // A rejecting driver must still CONCLUDE its stream — uncaught, the subscription sat
+                    // open forever and the floating spawn promise was an unhandled rejection.
+                    console.error(`Executor '${runtime}' threw outside its operation result contract:`, cause);
+                    result = Results.failure("scheme:exec", "executor-threw", 500, `The '${runtime}' executor failed outside its operation result contract.`, {}, {
                         runtime,
-                        stage: "result-validation",
+                        stage: "execution",
                         retryable: false,
                     });
                 }
-            }
-            catch (cause) {
-                // A rejecting driver must still CONCLUDE its stream — uncaught, the subscription sat
-                // open forever and the floating spawn promise was an unhandled rejection.
-                console.error(`Executor '${runtime}' threw outside its operation result contract:`, cause);
-                result = Results.failure("scheme:exec", "executor-threw", 500, `The '${runtime}' executor failed outside its operation result contract.`, {}, {
-                    runtime,
-                    stage: "execution",
-                    retryable: false,
-                });
-            }
             const exitCode = typeof result.exitCode === "number" ? result.exitCode : null;
             // A timeout aborts the spawn → the executor reports 499; replace the
             // complete result so status and Problem remain one valid truth.
             if (timedOut) {
-                result = Results.failure("scheme:exec", "execution-timeout", 504, `Execution of '${runtime}' exceeded its ${timeoutSec}-second deadline.`, exitCode === null ? {} : { exitCode }, {
+                result = Results.failure("scheme:exec", "execution-timeout", 504, `Execution of '${runtime}' exceeded its ${(timeoutSec ?? 0) / 60}-minute deadline.`, exitCode === null ? {} : { exitCode }, {
                     runtime,
-                    timeoutSeconds: timeoutSec,
+                    timeoutMinutes: (timeoutSec ?? 0) / 60,
                     stage: "execution",
                     retryable: false,
                 });
@@ -773,7 +790,7 @@ export default class Exec extends CoreSchemeAdapterBase {
                 });
             }
             exitLabel = timedOut
-                ? `timed out after ${timeoutSec}s`
+                ? `timed out after ${(timeoutSec ?? 0) / 60}m`
                 : result.status === 499
                     ? "aborted"
                     : exitCode !== null