@kvman/kvcoder 0.1.5 → 0.1.7

package/dist/connectors/mcp.js

@@ -1,20 +1,24 @@
 import { z } from '@kvman/sdk';
 import { callTimeout } from "../calls/shell-command.js";
 import { mcpServer } from "../mcp/servers.js";
+import { payloadSignature } from "../connector-call.js";
 import { listTools, resultText, toolNamed } from "../mcp/tools.js";
 import { callInput } from "./connector-command.js";
 import { timeoutMs } from "./payload-fields.js";
 // The `mcp` connector (plan 08 §8.5, ADR 0020, 3, 7, and 10): the tools of the MCP servers the person added. `tools`
-// lists a server's tools or gives one tool's arguments; `call` runs a tool, after the person's approval when it is risky.
+// lists a server's tools or gives one tool's arguments; `call` runs a tool, after the person's approval when it is risky;
+// `run` runs several on one connection, so a server that keeps state between tools keeps it for the run (ADR 0070, 1).
 // The MCP client is loaded by the first call that connects, so a kvman with no server doesn't keep it in memory.
 /** What the prompt's index says the connector is for; the session's entry adds its servers. */
-export const mcpDescription = 'Tools from the MCP servers the person added. Call tools with { "server" } to see what a server offers, and with { "server", "tool" } to see a tool\'s arguments, before the first time you call it.';
+export const mcpDescription = 'Tools from the MCP servers the person added. Call tools with { "server" } to see what a server offers and what each tool takes; ask for one tool with { "server", "tool" } only when you need its full schema. Each call starts the server and closes it, so a server that keeps state between tools, such as a browser, keeps it only inside one run: put the tools that belong together (open the page, fill, click, read) in one run.';
 /** The connector's description with the workspace's servers, as the prompt's index shows it. */
 export function mcpIndexDescription(servers) {
     return `${mcpDescription} Servers: ${servers.map((server) => `${server.name} (${server.description.replace(/[.\s]+$/, '')})`).join(', ')}.`;
 }
 const server = z.string().min(1).describe('The MCP server, by the name the system prompt lists.');
-const risky = z.boolean().describe('true when the tool could change, delete, or send something that isn\'t your own work: creating or closing an issue, sending a message, writing to a database. The person is asked first. false for a tool that only reads.');
+const risky = z.boolean().describe('true when the tool could change, delete, or send something: creating or closing an issue, sending a message, writing to a database. The person is asked first. false for a tool that only reads.');
+/** The tools one run calls at most. */
+export const runStepsLimit = 20;
 const payloads = {
     tools: z.strictObject({ server, tool: z.string().min(1).describe("One tool to describe with its arguments' JSON Schema; every tool's name and description when left out.").exactOptional() }),
     call: z.strictObject({
@@ -24,15 +28,27 @@ const payloads = {
         timeoutMs,
         risky,
     }),
+    run: z.strictObject({
+        server,
+        steps: z
+            .array(z.strictObject({ tool: z.string().min(1).describe('The tool to call, by its name from tools.'), arguments: z.record(z.string(), z.json()).describe("The tool's arguments; leave it out for a tool that takes none.").exactOptional() }))
+            .min(1)
+            .max(runStepsLimit)
+            .describe('The tools to call on one connection, in order; the run stops at the first one that reports an error.'),
+        timeoutMs,
+        risky,
+    }),
 };
 export const mcpCommands = {
     tools: { registration: 'kvcoder.mcp.tool.describe', description: "Lists an MCP server's tools, or gives one tool's description and arguments.", payload: payloads.tools, asks: false },
     call: { registration: 'kvcoder.mcp.tool.call', description: "Calls one tool of an MCP server and returns the tool's text.", payload: payloads.call, asks: true, result: "the tool's text." },
+    run: { registration: 'kvcoder.mcp.steps.run', description: 'Calls several tools of an MCP server on one connection, in order, so the server keeps its state between them; stops at the first tool that reports an error.', payload: payloads.run, asks: true, result: "each step's text under ## <n>. <tool>, and [stopped: N steps not run] when a tool reported an error." },
 };
 /** What `kvcoder.mcp.tool.call` gives: the tool's text, and whether the tool says it failed. */
 export const mcpCallSchema = z.object({ text: z.string(), isError: z.boolean() });
 const toolRowSchema = z.object({ name: z.string(), description: z.string() });
-const describeOutput = z.union([z.object({ server: z.string(), tools: z.array(toolRowSchema) }), toolRowSchema.extend({ server: z.string(), arguments: z.json() })]);
+// A list says what each tool takes (ADR 0070, 2), so one call is enough to use a server's tools.
+const describeOutput = z.union([z.object({ server: z.string(), tools: z.array(toolRowSchema.extend({ takes: z.string() })) }), toolRowSchema.extend({ server: z.string(), arguments: z.json() })]);
 // The jobs may run for the call's longest timeout, with room to report it.
 const jobOptions = { retries: 0, timeoutMs: 660_000 };
 export function registerMcpConnector(ctx) {
@@ -46,7 +62,7 @@ export function registerMcpConnector(ctx) {
             const { withServer } = await import("../mcp/connect.js");
             const tools = await withServer(ctx, found, callTimeout(undefined), listTools);
             if (payload.tool === undefined)
-                return { server: found.name, tools: tools.map((tool) => ({ name: tool.name, description: tool.description ?? '' })) };
+                return { server: found.name, tools: tools.map((tool) => ({ name: tool.name, description: tool.description ?? '', takes: payloadSignature(tool.inputSchema) ?? '{}' })) };
             const tool = toolNamed(found.name, tools, payload.tool);
             return { server: found.name, name: tool.name, description: tool.description ?? '', arguments: tool.inputSchema };
         },
@@ -59,10 +75,42 @@ export function registerMcpConnector(ctx) {
         handle: async ({ payload }) => {
             const found = await mcpServer(ctx, payload.server);
             const { withServer } = await import("../mcp/connect.js");
-            return withServer(ctx, found, callTimeout(payload.timeoutMs), async (connection) => {
+            const result = await withServer(ctx, found, callTimeout(payload.timeoutMs), async (connection) => {
                 toolNamed(found.name, await listTools(connection), payload.tool);
                 return resultText(await connection.client.callTool({ name: payload.tool, arguments: payload.arguments ?? {} }, undefined, connection.request));
             });
+            // Read after the call, which may have refreshed the tokens: no secret kvman holds for the server leaves in a result (ADR 0056, 9).
+            const { knownSecrets, withoutSecrets } = await import("../mcp/secrets.js");
+            return { ...result, text: withoutSecrets(result.text, await knownSecrets(ctx, found)) };
+        },
+    });
+    ctx.registerCommand('kvcoder.mcp.steps.run', {
+        description: mcpCommands.run.description,
+        input: callInput(payloads.run),
+        output: mcpCallSchema,
+        ...jobOptions,
+        handle: async ({ payload }) => {
+            const found = await mcpServer(ctx, payload.server);
+            const { withServer } = await import("../mcp/connect.js");
+            const result = await withServer(ctx, found, callTimeout(payload.timeoutMs), async (connection) => {
+                const tools = await listTools(connection);
+                for (const step of payload.steps)
+                    toolNamed(found.name, tools, step.tool);
+                const parts = [];
+                for (const [index, step] of payload.steps.entries()) {
+                    const done = resultText(await connection.client.callTool({ name: step.tool, arguments: step.arguments ?? {} }, undefined, connection.request));
+                    parts.push(`## ${String(index + 1)}. ${step.tool}\n${done.text}`);
+                    if (!done.isError)
+                        continue;
+                    const left = payload.steps.length - index - 1;
+                    if (left > 0)
+                        parts.push(`[stopped: ${String(left)} ${left === 1 ? 'step' : 'steps'} not run]`);
+                    return { text: parts.join('\n\n'), isError: true };
+                }
+                return { text: parts.join('\n\n'), isError: false };
+            });
+            const { knownSecrets, withoutSecrets } = await import("../mcp/secrets.js");
+            return { ...result, text: withoutSecrets(result.text, await knownSecrets(ctx, found)) };
         },
     });
 }

package/dist/connectors/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/connectors/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAY,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAkB,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAyB,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,qHAAqH;AACrH,0HAA0H;AAC1H,iHAAiH;AAEjH,+FAA+F;AAC/F,MAAM,CAAC,MAAM,cAAc,GACzB,qMAAqM,CAAC;AAExM,gGAAgG;AAChG,MAAM,UAAU,mBAAmB,CAAC,OAA6B;IAC/D,OAAO,GAAG,cAAc,aAAa,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AAC9I,CAAC;AAED,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,sDAAsD,CAAC,CAAC;AAClG,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,4NAA4N,CAAC,CAAC;AAEjQ,MAAM,QAAQ,GAAG;IACf,KAAK,EAAE,CAAC,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,wGAAwG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC;IAC7L,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC;QACnB,MAAM;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,2CAA2C,CAAC;QAC7E,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,oGAAoG,CAAC,CAAC,aAAa,EAAE;QACxK,SAAS;QACT,KAAK;KACN,CAAC;CACH,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,KAAK,EAAE,EAAE,YAAY,EAAE,2BAA2B,EAAE,WAAW,EAAE,6EAA6E,EAAE,OAAO,EAAE,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;IACtL,IAAI,EAAE,EAAE,YAAY,EAAE,uBAAuB,EAAE,WAAW,EAAE,8DAA8D,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE;CAClJ,CAAC;AAE7C,gGAAgG;AAChG,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAElF,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC9E,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;AAErK,2EAA2E;AAC3E,MAAM,UAAU,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;AAEtD,MAAM,UAAU,oBAAoB,CAAC,GAAQ;IAC3C,GAAG,CAAC,eAAe,CAAC,2BAA2B,EAAE;QAC/C,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,WAAW;QAC1C,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;QAChC,MAAM,EAAE,cAAc;QACtB,GAAG,UAAU;QACb,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YAC5B,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACnD,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACzD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;YAC9E,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;gBAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;YACtJ,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACxD,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;QACnH,CAAC;KACF,CAAC,CAAC;IACH,GAAG,CAAC,eAAe,CAAC,uBAAuB,EAAE;QAC3C,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,WAAW;QACzC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC/B,MAAM,EAAE,aAAa;QACrB,GAAG,UAAU;QACb,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YAC5B,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACnD,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACzD,OAAO,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACjF,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,SAAS,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBACjE,OAAO,UAAU,CAAC,MAAM,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YACjJ,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/connectors/mcp.ts"],"names":[],"mappings":"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"}

package/dist/connectors/payload-fields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payload-fields.d.ts","sourceRoot":"","sources":["../../src/connectors/payload-fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAK/B,eAAO,MAAM,KAAK,cAEoQ,CAAC;AAEvR,eAAO,MAAM,UAAU,kCAAsK,CAAC;AAE9L,eAAO,MAAM,SAAS,iCAAqK,CAAC;AAE5L,eAAO,MAAM,KAAK;;;mBAGsG,CAAC"}
+{"version":3,"file":"payload-fields.d.ts","sourceRoot":"","sources":["../../src/connectors/payload-fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAK/B,eAAO,MAAM,KAAK,cAE4b,CAAC;AAE/c,eAAO,MAAM,UAAU,kCAAsK,CAAC;AAE9L,eAAO,MAAM,SAAS,iCAAqK,CAAC;AAE5L,eAAO,MAAM,KAAK;;;mBAGsG,CAAC"}

package/dist/connectors/payload-fields.js

@@ -3,7 +3,7 @@ import { z } from '@kvman/sdk';
 // shows these schemas to the model (ADR 0011, 10).
 export const risky = z
     .boolean()
-    .describe("true when this could lose or damage something that isn't your own work, or reaches outside the workspace folder: deleting or overwriting files you didn't create, sudo, a global install, git push --force or reset --hard. The person is asked first. Otherwise false.");
+    .describe("false for the ordinary work of the task: a file inside the workspace folder that the task needs, whoever made it, or the project's own build, tests, and tools. true when this could do what is hard to take back or reaches past the task: anything outside the workspace folder, deleting files, a file that holds secrets, sudo, an install outside the project, git push --force or reset --hard, or sending something out. The person is then asked first.");
 export const background = z.boolean().describe('true keeps a server or any long-running command running after the call returns; follow it up with the background connector.').exactOptional();
 export const timeoutMs = z.number().int().positive().describe('How long the command may run, in milliseconds: 120000 by default, at most 600000. Ignored with background.').exactOptional();
 export const edits = z

package/dist/connectors/payload-fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"payload-fields.js","sourceRoot":"","sources":["../../src/connectors/payload-fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAE/B,mHAAmH;AACnH,mDAAmD;AAEnD,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC;KACnB,OAAO,EAAE;KACT,QAAQ,CAAC,yQAAyQ,CAAC,CAAC;AAEvR,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,6HAA6H,CAAC,CAAC,aAAa,EAAE,CAAC;AAE9L,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4GAA4G,CAAC,CAAC,aAAa,EAAE,CAAC;AAE5L,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC;KACnB,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mGAAmG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAC;KACxN,GAAG,CAAC,CAAC,CAAC;KACN,QAAQ,CAAC,2GAA2G,CAAC,CAAC"}
+{"version":3,"file":"payload-fields.js","sourceRoot":"","sources":["../../src/connectors/payload-fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAE/B,mHAAmH;AACnH,mDAAmD;AAEnD,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC;KACnB,OAAO,EAAE;KACT,QAAQ,CAAC,icAAic,CAAC,CAAC;AAE/c,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,6HAA6H,CAAC,CAAC,aAAa,EAAE,CAAC;AAE9L,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4GAA4G,CAAC,CAAC,aAAa,EAAE,CAAC;AAE5L,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC;KACnB,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mGAAmG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAC;KACxN,GAAG,CAAC,CAAC,CAAC;KACN,QAAQ,CAAC,2GAA2G,CAAC,CAAC"}

package/dist/delegate/approved-run.d.ts

@@ -1,13 +1,11 @@
-import { type Ctx } from '@kvman/sdk';
-import type { RunCallDoc } from '../schemas/records.ts';
+import { type Ctx, type Stored } from '@kvman/sdk';
+import type { QuestionDoc, RunCallDoc } from '../schemas/records.ts';
 type Approved = {
-    sessionId: string;
-    toolCallId: string;
+    question: Stored<QuestionDoc>;
     call: RunCallDoc;
 };
-/** Whether an approved call is a worker's run, which never runs as a held call does. */
 export declare const isDelegateRun: (call: RunCallDoc) => boolean;
-/** Starts the run of an approved call; resolves to the next step's job id when the call got its result at once and nothing else is pending. */
+/** Prepares asynchronously, then consumes only the exact approval alongside run creation/pending replacement. */
 export declare function startApprovedRun(ctx: Ctx, approved: Approved): Promise<string | null>;
 export {};
 //# sourceMappingURL=approved-run.d.ts.map

package/dist/delegate/approved-run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approved-run.d.ts","sourceRoot":"","sources":["../../src/delegate/approved-run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAIpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAUxD,KAAK,QAAQ,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC;AAE5E,wFAAwF;AACxF,eAAO,MAAM,aAAa,GAAI,MAAM,UAAU,KAAG,OAAkE,CAAC;AAOpH,+IAA+I;AAC/I,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiC3F"}
+{"version":3,"file":"approved-run.d.ts","sourceRoot":"","sources":["../../src/delegate/approved-run.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,GAAG,EAAE,KAAK,MAAM,EAAE,MAAM,YAAY,CAAC;AAMjE,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAWrE,KAAK,QAAQ,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC;AAEpE,eAAO,MAAM,aAAa,GAAI,MAAM,UAAU,KAAG,OAAkE,CAAC;AAsBpH,iHAAiH;AACjH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA8C3F"}

package/dist/delegate/approved-run.js

@@ -1,54 +1,94 @@
+import { isDeepStrictEqual } from 'node:util';
 import { ProblemError } from '@kvman/sdk';
 import { delegateRunSchema } from "../connectors/delegate.js";
 import { errorOutput } from "../connector-call.js";
+import { invalid } from "../problems.js";
+import { prepareGrants } from "../prompt/session-grants.js";
 import { firePoint } from "../registry/session-points.js";
 import { records, txRecords } from "../store/collections.js";
-import { heldText, resolvePending } from "../turns/resolve.js";
-import { createRun, dropRun, launchRun } from "./runs.js";
+import { heldText, resolvePendingInTx } from "../turns/resolve.js";
+import { dispatchStep } from "../turns/start-turn.js";
+import { delegationInTx, refusePending, waitingInTx } from "./permission.js";
+import { recordRun } from "./runs.js";
+import { startBackgroundRun } from "./start-background.js";
+import { startPending } from "./start-pending.js";
 import { availableWorker, isProgram } from "./workers.js";
-/** Whether an approved call is a worker's run, which never runs as a held call does. */
 export const isDelegateRun = (call) => call.connector === 'delegate' && call.command === 'run';
-async function refuse(ctx, approved, error) {
-    if (!(error instanceof ProblemError))
+function approvalAuthority(question) {
+    return { sessionId: question.sessionId, turnId: question.turnId, pending: { toolCallId: question.toolCallId, kind: 'approval', questionId: question.id, question: question.question, childSessionId: null, runId: null } };
+}
+function currentApproval(store, approved, authority) {
+    const found = waitingInTx(store, authority);
+    return found === undefined || !isDeepStrictEqual(store.questions.get(approved.question.id), approved.question) ? undefined : found;
+}
+async function refuseApproval(ctx, approved, authority, error) {
+    if (!(error instanceof ProblemError) || ctx.job.signal.aborted)
         throw error;
-    return resolvePending(ctx, approved.sessionId, approved.toolCallId, heldText(approved.toolCallId, errorOutput(error.problem).output, true), false);
+    const identity = await ctx.store.transaction(tx => {
+        const store = txRecords(tx);
+        if (currentApproval(store, approved, authority) === undefined)
+            return null;
+        store.questions.delete(approved.question.id);
+        return resolvePendingInTx(store, authority.sessionId, authority.pending.toolCallId, heldText(authority.pending.toolCallId, errorOutput(error.problem).output, true));
+    });
+    return identity === null ? null : dispatchStep(ctx, identity, false);
 }
-/** Starts the run of an approved call; resolves to the next step's job id when the call got its result at once and nothing else is pending. */
+/** Prepares asynchronously, then consumes only the exact approval alongside run creation/pending replacement. */
 export async function startApprovedRun(ctx, approved) {
-    const { sessionId, toolCallId, call } = approved;
-    const payload = delegateRunSchema.parse(call.payload);
-    const session = await records(ctx.store).sessions.get(sessionId);
-    let worker;
+    const { question, call } = approved, { sessionId, toolCallId } = question;
+    const payload = delegateRunSchema.parse(call.payload), authority = approvalAuthority(question);
+    const background = payload.background === true;
+    let run;
     try {
-        worker = await availableWorker(ctx, session?.checks ?? null, payload.worker);
+        const session = await records(ctx.store).sessions.get(sessionId);
+        const worker = await availableWorker(ctx, session?.checks ?? null, payload.worker);
         if (!isProgram(worker))
-            throw new ProblemError({ code: 'VALIDATION_FAILED', message: `The worker ${worker.name} changed while the call waited. Make the call again.`, params: { worker: worker.name } });
+            throw invalid(`The worker ${worker.name} changed while the call waited. Make the call again.`);
+        const prepared = await prepareGrants(ctx);
+        run = await ctx.store.transaction(tx => {
+            ctx.job.signal.throwIfAborted();
+            const store = txRecords(tx), found = currentApproval(store, approved, authority);
+            if (found === undefined)
+                return undefined;
+            delegationInTx(store, sessionId, prepared, worker.name, worker.kind);
+            const saved = recordRun(store, sessionId, worker, { description: call.description, task: payload.task }, background ? null : toolCallId);
+            store.questions.delete(question.id);
+            if (!background)
+                store.turns.update(question.turnId, { pending: found.turn.pending.map(item => item.toolCallId === toolCallId ? { toolCallId, kind: 'worker', questionId: null, question: null, childSessionId: null, runId: saved.id } : item) });
+            return saved;
+        });
     }
     catch (error) {
-        return refuse(ctx, approved, error);
+        return refuseApproval(ctx, approved, authority, error);
     }
-    const background = payload.background === true;
-    const run = await createRun(ctx, sessionId, worker, { description: call.description, task: payload.task }, background ? null : toolCallId);
-    if (background) {
-        await launchRun(ctx, run.id);
-        const text = `started ${run.id}`;
-        return resolvePending(ctx, sessionId, toolCallId, { toolCallId, text, isError: false, run: null, details: { description: call.description, connector: call.connector, command: call.command, output: text, durationMs: 0 } }, false);
+    if (run === undefined)
+        return null;
+    if (!background) {
+        await startPending(ctx, { sessionId, turnId: question.turnId, pending: { toolCallId, kind: 'worker', questionId: null, question: null, childSessionId: null, runId: run.id } });
+        await firePoint(ctx, 'kvcoder.session.waiting', { sessionId, kind: 'worker' });
+        return null;
+    }
+    try {
+        await startBackgroundRun(ctx, run, async () => {
+            const prepared = await prepareGrants(ctx);
+            return store => {
+                ctx.job.signal.throwIfAborted();
+                if (waitingInTx(store, authority) === undefined)
+                    throw invalid('The originating approval is no longer current.');
+                return delegationInTx(store, sessionId, prepared, run.worker, run.kind).session;
+            };
+        }, store => waitingInTx(store, authority) !== undefined);
     }
-    const waiting = await ctx.store.transaction((tx) => {
+    catch (error) {
+        if (!(error instanceof ProblemError) || ctx.job.signal.aborted)
+            throw error;
+        return refusePending(ctx, authority, error);
+    }
+    const text = `started ${run.id}`;
+    const identity = await ctx.store.transaction(tx => {
         const store = txRecords(tx);
-        const current = store.sessions.get(sessionId);
-        const turn = current === undefined || current.turnId === null ? undefined : store.turns.get(current.turnId);
-        if (turn === undefined || !turn.pending.some((item) => item.toolCallId === toolCallId))
-            return false;
-        store.turns.update(turn.id, { pending: turn.pending.map((item) => (item.toolCallId === toolCallId ? { toolCallId, kind: 'worker', questionId: null, question: null, childSessionId: null, runId: run.id } : item)) });
-        return true;
+        return waitingInTx(store, authority) === undefined ? null : resolvePendingInTx(store, sessionId, toolCallId, { toolCallId, text, isError: false, run: null, details: { description: call.description, connector: call.connector, command: call.command, output: text, durationMs: 0 } });
     });
-    if (!waiting) {
-        await dropRun(ctx, run);
-        return null;
-    }
-    await launchRun(ctx, run.id);
-    await firePoint(ctx, 'kvcoder.session.waiting', { sessionId, kind: 'worker' });
-    return null;
+    return identity === null ? null : dispatchStep(ctx, identity, false);
 }
 //# sourceMappingURL=approved-run.js.map

package/dist/delegate/approved-run.js.map

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

package/dist/delegate/git-staging.d.ts

@@ -0,0 +1,12 @@
+/** What is staged, as a tree, and the commit `HEAD` names; `head` is `null` before the first commit. */
+export type StagingMark = {
+    tree: string;
+    head: string | null;
+};
+/** The folder's mark now; `undefined` outside a repository, without Git, or while the index has unresolved conflicts. */
+export declare function stagingMark(folder: string, signal: AbortSignal): Promise<StagingMark | undefined>;
+/** How many paths differ between two staged trees. */
+export declare function stagedPathsBetween(folder: string, before: string, after: string, signal: AbortSignal): Promise<number>;
+/** Makes the staging area `tree` again; no file in the folder and no commit changes. */
+export declare function restoreStaging(folder: string, tree: string, signal: AbortSignal): Promise<void>;
+//# sourceMappingURL=git-staging.d.ts.map

package/dist/delegate/git-staging.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-staging.d.ts","sourceRoot":"","sources":["../../src/delegate/git-staging.ts"],"names":[],"mappings":"AAaA,wGAAwG;AACxG,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAoBhE,yHAAyH;AACzH,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAavG;AAED,sDAAsD;AACtD,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAG5H;AAED,wFAAwF;AACxF,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAErG"}

package/dist/delegate/git-staging.js

@@ -0,0 +1,54 @@
+import { execFile } from 'node:child_process';
+import { copyFile, mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { promisify } from 'node:util';
+import { isMissing } from "../files/read-file.js";
+// A folder's Git staging area, marked around a program worker's run (plan 08 §8.5; ADR 0060, 4). The staged tree is
+// written from a copy of the index, so the person's index file is never written by a mark. A repository's own
+// configuration may name a program as its file monitor, which Git would run: it is turned off.
+const run = promisify(execFile);
+async function git(folder, args, signal, env = process.env) {
+    return (await run('git', ['-c', 'core.fsmonitor=false', ...args], { cwd: folder, signal, env, maxBuffer: 64 * 1024 * 1024 })).stdout.trim();
+}
+async function treeOfCopy(folder, index, signal) {
+    const scratch = await mkdtemp(path.join(tmpdir(), 'kvcoder-index-'));
+    try {
+        const copy = path.join(scratch, 'index');
+        // A repository with nothing staged yet has no index file: Git reads a missing one as empty.
+        await copyFile(index, copy).catch((error) => {
+            if (!isMissing(error))
+                throw error;
+        });
+        return await git(folder, ['write-tree'], signal, { ...process.env, GIT_INDEX_FILE: copy });
+    }
+    finally {
+        await rm(scratch, { recursive: true, force: true });
+    }
+}
+/** The folder's mark now; `undefined` outside a repository, without Git, or while the index has unresolved conflicts. */
+export async function stagingMark(folder, signal) {
+    try {
+        const index = path.resolve(folder, await git(folder, ['rev-parse', '--git-path', 'index'], signal));
+        const tree = await treeOfCopy(folder, index, signal);
+        const head = await git(folder, ['rev-parse', '--verify', '--quiet', 'HEAD'], signal).catch(() => {
+            signal.throwIfAborted();
+            return '';
+        });
+        return { tree, head: head === '' ? null : head };
+    }
+    catch {
+        signal.throwIfAborted();
+        return undefined;
+    }
+}
+/** How many paths differ between two staged trees. */
+export async function stagedPathsBetween(folder, before, after, signal) {
+    const names = await git(folder, ['diff', '--no-ext-diff', '--name-only', '-z', before, after], signal);
+    return names.split('\0').filter((name) => name !== '').length;
+}
+/** Makes the staging area `tree` again; no file in the folder and no commit changes. */
+export async function restoreStaging(folder, tree, signal) {
+    await git(folder, ['read-tree', tree], signal);
+}
+//# sourceMappingURL=git-staging.js.map

package/dist/delegate/git-staging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-staging.js","sourceRoot":"","sources":["../../src/delegate/git-staging.ts"],"names":[],"mappings":"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"}