@kvman/kvcoder 0.1.14 → 0.1.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/artifacts/ended-url.d.ts +4 -0
- package/dist/artifacts/ended-url.d.ts.map +1 -0
- package/dist/artifacts/ended-url.js +30 -0
- package/dist/artifacts/ended-url.js.map +1 -0
- package/dist/calls/line-run.d.ts +1 -0
- package/dist/calls/line-run.d.ts.map +1 -1
- package/dist/calls/line-run.js +4 -1
- package/dist/calls/line-run.js.map +1 -1
- package/dist/calls/run-tool.d.ts +38 -1
- package/dist/calls/run-tool.d.ts.map +1 -1
- package/dist/calls/run-tool.js +46 -1
- package/dist/calls/run-tool.js.map +1 -1
- package/dist/connector-call.d.ts +7 -2
- package/dist/connector-call.d.ts.map +1 -1
- package/dist/connector-call.js +8 -4
- package/dist/connector-call.js.map +1 -1
- package/dist/connectors/artifact.d.ts.map +1 -1
- package/dist/connectors/artifact.js +10 -2
- package/dist/connectors/artifact.js.map +1 -1
- package/dist/connectors/background.d.ts +1 -1
- package/dist/connectors/background.d.ts.map +1 -1
- package/dist/connectors/background.js +5 -2
- package/dist/connectors/background.js.map +1 -1
- package/dist/connectors/binary.js +2 -2
- package/dist/connectors/binary.js.map +1 -1
- package/dist/connectors/builtin-connectors.d.ts +16 -3
- package/dist/connectors/builtin-connectors.d.ts.map +1 -1
- package/dist/connectors/delegate.d.ts +20 -13
- package/dist/connectors/delegate.d.ts.map +1 -1
- package/dist/connectors/delegate.js +27 -20
- package/dist/connectors/delegate.js.map +1 -1
- package/dist/connectors/execution-map.d.ts +1 -1
- package/dist/connectors/execution-map.d.ts.map +1 -1
- package/dist/connectors/execution-map.js +1 -1
- package/dist/connectors/execution-map.js.map +1 -1
- package/dist/connectors/mcp.d.ts +1 -1
- package/dist/connectors/mcp.d.ts.map +1 -1
- package/dist/connectors/mcp.js +12 -7
- package/dist/connectors/mcp.js.map +1 -1
- package/dist/connectors/payload-fields.d.ts +1 -0
- package/dist/connectors/payload-fields.d.ts.map +1 -1
- package/dist/connectors/payload-fields.js +1 -0
- package/dist/connectors/payload-fields.js.map +1 -1
- package/dist/connectors/shell.d.ts +1 -0
- package/dist/connectors/shell.d.ts.map +1 -1
- package/dist/connectors/shell.js +2 -2
- package/dist/connectors/shell.js.map +1 -1
- package/dist/delegate/approved-run.d.ts.map +1 -1
- package/dist/delegate/approved-run.js +4 -11
- package/dist/delegate/approved-run.js.map +1 -1
- package/dist/delegate/brief.d.ts +34 -0
- package/dist/delegate/brief.d.ts.map +1 -0
- package/dist/delegate/brief.js +84 -0
- package/dist/delegate/brief.js.map +1 -0
- package/dist/delegate/continue-helper.d.ts.map +1 -1
- package/dist/delegate/continue-helper.js +6 -7
- package/dist/delegate/continue-helper.js.map +1 -1
- package/dist/delegate/permission.d.ts +26 -1
- package/dist/delegate/permission.d.ts.map +1 -1
- package/dist/delegate/program-permission.d.ts +1 -1
- package/dist/delegate/runs.d.ts +7 -3
- package/dist/delegate/runs.d.ts.map +1 -1
- package/dist/delegate/runs.js +2 -2
- package/dist/delegate/runs.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/jobs/notify-watch.d.ts +5 -0
- package/dist/jobs/notify-watch.d.ts.map +1 -0
- package/dist/jobs/notify-watch.js +53 -0
- package/dist/jobs/notify-watch.js.map +1 -0
- package/dist/jobs/process-handlers.d.ts.map +1 -1
- package/dist/jobs/process-handlers.js +2 -1
- package/dist/jobs/process-handlers.js.map +1 -1
- package/dist/jobs/process-records.d.ts +4 -1
- package/dist/jobs/process-records.d.ts.map +1 -1
- package/dist/jobs/process-records.js +6 -2
- package/dist/jobs/process-records.js.map +1 -1
- package/dist/jobs/process-report.d.ts +2 -1
- package/dist/jobs/process-report.d.ts.map +1 -1
- package/dist/jobs/process-report.js +8 -5
- package/dist/jobs/process-report.js.map +1 -1
- package/dist/jobs/process-run.d.ts +1 -1
- package/dist/jobs/process-run.d.ts.map +1 -1
- package/dist/jobs/process-run.js +7 -3
- package/dist/jobs/process-run.js.map +1 -1
- package/dist/mcp/connect.d.ts +10 -5
- package/dist/mcp/connect.d.ts.map +1 -1
- package/dist/mcp/connect.js +22 -9
- package/dist/mcp/connect.js.map +1 -1
- package/dist/mcp/servers.d.ts +4 -0
- package/dist/mcp/servers.d.ts.map +1 -1
- package/dist/mcp/servers.js +5 -1
- package/dist/mcp/servers.js.map +1 -1
- package/dist/mcp/turn-servers.d.ts +8 -0
- package/dist/mcp/turn-servers.d.ts.map +1 -0
- package/dist/mcp/turn-servers.js +88 -0
- package/dist/mcp/turn-servers.js.map +1 -0
- package/dist/prompt/build-prompt.d.ts +1 -1
- package/dist/prompt/build-prompt.d.ts.map +1 -1
- package/dist/prompt/build-prompt.js +2 -3
- package/dist/prompt/build-prompt.js.map +1 -1
- package/dist/prompt/kept-rules.d.ts +6 -0
- package/dist/prompt/kept-rules.d.ts.map +1 -0
- package/dist/prompt/kept-rules.js +47 -0
- package/dist/prompt/kept-rules.js.map +1 -0
- package/dist/prompt/project-rules.d.ts +7 -2
- package/dist/prompt/project-rules.d.ts.map +1 -1
- package/dist/prompt/project-rules.js +27 -16
- package/dist/prompt/project-rules.js.map +1 -1
- package/dist/prompt/session-grants.d.ts +16 -23
- package/dist/prompt/session-grants.d.ts.map +1 -1
- package/dist/prompt/session-prompt.d.ts +1 -1
- package/dist/prompt/session-prompt.d.ts.map +1 -1
- package/dist/prompt/session-prompt.js +16 -9
- package/dist/prompt/session-prompt.js.map +1 -1
- package/dist/prompt/working-method.js +7 -7
- package/dist/prompt/working-method.js.map +1 -1
- package/dist/register-settings.d.ts +1 -0
- package/dist/register-settings.d.ts.map +1 -1
- package/dist/register-settings.js +1 -0
- package/dist/register-settings.js.map +1 -1
- package/dist/registry/register-connectors.d.ts +17 -1
- package/dist/registry/register-connectors.d.ts.map +1 -1
- package/dist/registry/register-connectors.js +11 -7
- package/dist/registry/register-connectors.js.map +1 -1
- package/dist/schemas/delegate-brief.d.ts +20 -0
- package/dist/schemas/delegate-brief.d.ts.map +1 -0
- package/dist/schemas/delegate-brief.js +9 -0
- package/dist/schemas/delegate-brief.js.map +1 -0
- package/dist/schemas/kept-rule.d.ts +12 -0
- package/dist/schemas/kept-rule.d.ts.map +1 -0
- package/dist/schemas/kept-rule.js +7 -0
- package/dist/schemas/kept-rule.js.map +1 -0
- package/dist/schemas/mcp-session.d.ts +15 -0
- package/dist/schemas/mcp-session.d.ts.map +1 -0
- package/dist/schemas/mcp-session.js +14 -0
- package/dist/schemas/mcp-session.js.map +1 -0
- package/dist/schemas/process-doc.d.ts +22 -0
- package/dist/schemas/process-doc.d.ts.map +1 -0
- package/dist/schemas/process-doc.js +20 -0
- package/dist/schemas/process-doc.js.map +1 -0
- package/dist/schemas/read-ending.d.ts +8 -0
- package/dist/schemas/read-ending.d.ts.map +1 -0
- package/dist/schemas/read-ending.js +4 -0
- package/dist/schemas/read-ending.js.map +1 -0
- package/dist/schemas/records.d.ts +29 -23
- package/dist/schemas/records.d.ts.map +1 -1
- package/dist/schemas/records.js +14 -16
- package/dist/schemas/records.js.map +1 -1
- package/dist/schemas/registry.d.ts +1 -0
- package/dist/schemas/registry.d.ts.map +1 -1
- package/dist/schemas/registry.js +3 -2
- package/dist/schemas/registry.js.map +1 -1
- package/dist/schemas/sent-record.d.ts +13 -0
- package/dist/schemas/sent-record.d.ts.map +1 -0
- package/dist/schemas/sent-record.js +7 -0
- package/dist/schemas/sent-record.js.map +1 -0
- package/dist/sessions/new-session.d.ts.map +1 -1
- package/dist/sessions/new-session.js +2 -0
- package/dist/sessions/new-session.js.map +1 -1
- package/dist/sessions/session-view.d.ts +7 -2
- package/dist/sessions/session-view.d.ts.map +1 -1
- package/dist/sessions/session-view.js +3 -0
- package/dist/sessions/session-view.js.map +1 -1
- package/dist/store/collections.d.ts +74 -6
- package/dist/store/collections.d.ts.map +1 -1
- package/dist/store/collections.js +6 -0
- package/dist/store/collections.js.map +1 -1
- package/dist/thinking-levels.d.ts +2 -0
- package/dist/thinking-levels.d.ts.map +1 -1
- package/dist/thinking-levels.js +4 -0
- package/dist/thinking-levels.js.map +1 -1
- package/dist/turns/background.d.ts +3 -0
- package/dist/turns/background.d.ts.map +1 -1
- package/dist/turns/background.js +10 -0
- package/dist/turns/background.js.map +1 -1
- package/dist/turns/clear-results.d.ts +2 -2
- package/dist/turns/clear-results.d.ts.map +1 -1
- package/dist/turns/clear-results.js +31 -15
- package/dist/turns/clear-results.js.map +1 -1
- package/dist/turns/collapse.d.ts +12 -0
- package/dist/turns/collapse.d.ts.map +1 -0
- package/dist/turns/collapse.js +67 -0
- package/dist/turns/collapse.js.map +1 -0
- package/dist/turns/connection-wait.d.ts +12 -0
- package/dist/turns/connection-wait.d.ts.map +1 -0
- package/dist/turns/connection-wait.js +56 -0
- package/dist/turns/connection-wait.js.map +1 -0
- package/dist/turns/end-turn-state.js +2 -2
- package/dist/turns/end-turn-state.js.map +1 -1
- package/dist/turns/end-turn.d.ts.map +1 -1
- package/dist/turns/end-turn.js +3 -0
- package/dist/turns/end-turn.js.map +1 -1
- package/dist/turns/history.d.ts +2 -0
- package/dist/turns/history.d.ts.map +1 -1
- package/dist/turns/history.js +1 -0
- package/dist/turns/history.js.map +1 -1
- package/dist/turns/model-context.d.ts +6 -2
- package/dist/turns/model-context.d.ts.map +1 -1
- package/dist/turns/model-context.js +26 -8
- package/dist/turns/model-context.js.map +1 -1
- package/dist/turns/model-retry.d.ts +5 -2
- package/dist/turns/model-retry.d.ts.map +1 -1
- package/dist/turns/model-retry.js +5 -3
- package/dist/turns/model-retry.js.map +1 -1
- package/dist/turns/read-endings.d.ts +8 -0
- package/dist/turns/read-endings.d.ts.map +1 -0
- package/dist/turns/read-endings.js +24 -0
- package/dist/turns/read-endings.js.map +1 -0
- package/dist/turns/run-calls.d.ts +0 -6
- package/dist/turns/run-calls.d.ts.map +1 -1
- package/dist/turns/run-calls.js +24 -26
- package/dist/turns/run-calls.js.map +1 -1
- package/dist/turns/run-command.d.ts +2 -0
- package/dist/turns/run-command.d.ts.map +1 -1
- package/dist/turns/run-command.js +6 -0
- package/dist/turns/run-command.js.map +1 -1
- package/dist/turns/run-scope.d.ts +7 -0
- package/dist/turns/run-scope.d.ts.map +1 -0
- package/dist/turns/run-scope.js +24 -0
- package/dist/turns/run-scope.js.map +1 -0
- package/dist/turns/sent-record.d.ts +4 -0
- package/dist/turns/sent-record.d.ts.map +1 -0
- package/dist/turns/sent-record.js +11 -0
- package/dist/turns/sent-record.js.map +1 -0
- package/dist/turns/settle-calls.d.ts.map +1 -1
- package/dist/turns/settle-calls.js +1 -19
- package/dist/turns/settle-calls.js.map +1 -1
- package/dist/turns/start-turn.js +1 -1
- package/dist/turns/start-turn.js.map +1 -1
- package/dist/turns/step.d.ts.map +1 -1
- package/dist/turns/step.js +36 -9
- package/dist/turns/step.js.map +1 -1
- package/dist/ui/register-ui.js +1 -1
- package/dist/ui/register-ui.js.map +1 -1
- package/dist/web/components/approval.css +1 -1
- package/dist/web/components/call.css +1 -1
- package/dist/web/components/call.js +1 -1
- package/dist/web/components/connectors.css +1 -1
- package/dist/web/components/connectors.js +186 -155
- package/dist/web/components/conversation.css +1 -1
- package/dist/web/components/conversation.js +1391 -1268
- package/dist/web/components/mcp-sign-in.css +1 -1
- package/dist/web/components/model.css +1 -1
- package/dist/web/components/preferences.css +1 -1
- package/dist/web/components/question.css +1 -1
- package/dist/web/components/sessions.css +1 -1
- package/dist/web/components/sessions.js +11 -7
- package/docs/connectors.md +3 -3
- package/locales/ar.json +17 -1
- package/locales/en.json +17 -1
- package/package.json +19 -4
- package/dist/delegate/start-pending.d.ts +0 -5
- package/dist/delegate/start-pending.d.ts.map +0 -1
- package/dist/delegate/start-pending.js +0 -42
- package/dist/delegate/start-pending.js.map +0 -1
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { Ctx } from '@kvman/sdk';
|
|
2
|
+
/** The id of the url artifact a new one may replace in a full chat, oldest first; `undefined` when the chat isn't full or none has stopped. */
|
|
3
|
+
export declare function endedUrlArtifact(ctx: Ctx, chatId: string, newId: string): Promise<string | undefined>;
|
|
4
|
+
//# sourceMappingURL=ended-url.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ended-url.d.ts","sourceRoot":"","sources":["../../src/artifacts/ended-url.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAsBtC,+IAA+I;AAC/I,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM3G"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { connect } from 'node:net';
|
|
2
|
+
import { records } from "../store/collections.js";
|
|
3
|
+
import { artifactCountLimit } from "./artifact-records.js";
|
|
4
|
+
// At the artifact limit, a new url artifact takes the place of the chat's oldest url artifact whose server has stopped
|
|
5
|
+
// (plan 08 §8.5, ADR 0108, 18): one whose address nothing answers on now, so it shows nothing anyway.
|
|
6
|
+
const answerWithinMs = 1_000;
|
|
7
|
+
// Whether something on this machine accepts a connection at the address's port.
|
|
8
|
+
function answers(address) {
|
|
9
|
+
const url = new URL(address);
|
|
10
|
+
const port = Number(url.port !== '' ? url.port : url.protocol === 'https:' ? '443' : '80');
|
|
11
|
+
return new Promise((resolve) => {
|
|
12
|
+
const socket = connect({ host: url.hostname, port });
|
|
13
|
+
const settle = (answered) => { socket.destroy(); resolve(answered); };
|
|
14
|
+
socket.setTimeout(answerWithinMs, () => settle(false));
|
|
15
|
+
socket.once('connect', () => settle(true));
|
|
16
|
+
socket.once('error', () => settle(false));
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
/** The id of the url artifact a new one may replace in a full chat, oldest first; `undefined` when the chat isn't full or none has stopped. */
|
|
20
|
+
export async function endedUrlArtifact(ctx, chatId, newId) {
|
|
21
|
+
const artifacts = await records(ctx.store).artifacts.find({ sessionId: chatId }, { limit: 1000 });
|
|
22
|
+
if (artifacts.length < artifactCountLimit || artifacts.some((artifact) => artifact.artifactId === newId))
|
|
23
|
+
return undefined;
|
|
24
|
+
const urls = artifacts.filter((artifact) => artifact.format === 'url').sort((a, b) => a.updatedAt.localeCompare(b.updatedAt));
|
|
25
|
+
for (const artifact of urls)
|
|
26
|
+
if (!(await answers(artifact.content)))
|
|
27
|
+
return artifact.artifactId;
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=ended-url.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ended-url.js","sourceRoot":"","sources":["../../src/artifacts/ended-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,uHAAuH;AACvH,sGAAsG;AAEtG,MAAM,cAAc,GAAG,KAAK,CAAC;AAE7B,gFAAgF;AAChF,SAAS,OAAO,CAAC,OAAe;IAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,CAAC,QAAiB,EAAQ,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,+IAA+I;AAC/I,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAQ,EAAE,MAAc,EAAE,KAAa;IAC5E,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClG,IAAI,SAAS,CAAC,MAAM,GAAG,kBAAkB,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,KAAK,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3H,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9H,KAAK,MAAM,QAAQ,IAAI,IAAI;QAAE,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAAE,OAAO,QAAQ,CAAC,UAAU,CAAC;IAChG,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
package/dist/calls/line-run.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ export declare const lineRunSchema: z.ZodObject<{
|
|
|
14
14
|
export type LineRun = z.output<typeof lineRunSchema>;
|
|
15
15
|
type LineOptions = {
|
|
16
16
|
background?: boolean | undefined;
|
|
17
|
+
notify?: boolean | undefined;
|
|
17
18
|
timeoutMs?: number | undefined;
|
|
18
19
|
};
|
|
19
20
|
export declare function runLine(ctx: Ctx, sessionId: string, line: string, options: LineOptions): Promise<LineRun>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-run.d.ts","sourceRoot":"","sources":["../../src/calls/line-run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"line-run.d.ts","sourceRoot":"","sources":["../../src/calls/line-run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAWzC,eAAO,MAAM,aAAa;;;;;;;;;;iBAUxB,CAAC;AAEH,0GAA0G;AAC1G,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAErD,KAAK,WAAW,GAAG;IAAE,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEtH,wBAAsB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAQ/G;AAED,0EAA0E;AAC1E,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAahD;AAED,8EAA8E;AAC9E,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAGpD;AAED,kHAAkH;AAClH,eAAO,MAAM,cAAc;;;CAAqC,CAAC"}
|
package/dist/calls/line-run.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { z } from '@kvman/sdk';
|
|
2
2
|
import { startProcess } from "../jobs/process-run.js";
|
|
3
|
+
import { invalid } from "../problems.js";
|
|
3
4
|
import { resultLines } from "../result-text.js";
|
|
4
5
|
import { runShell } from "./run-shell.js";
|
|
5
6
|
import { callTimeout } from "./shell-command.js";
|
|
@@ -18,12 +19,14 @@ export const lineRunSchema = z.object({
|
|
|
18
19
|
ended: z.boolean(),
|
|
19
20
|
});
|
|
20
21
|
export async function runLine(ctx, sessionId, line, options) {
|
|
22
|
+
if (options.notify === true && options.background !== true)
|
|
23
|
+
throw invalid('notify works only with background set to true: it wakes the chat when a background line ends.');
|
|
21
24
|
const shell = await shellFor(ctx);
|
|
22
25
|
const timeoutMs = callTimeout(options.timeoutMs);
|
|
23
26
|
if (options.background !== true)
|
|
24
27
|
return { ...(await runShell(shell, line, ctx.job.workspace.path, timeoutMs, ctx.job.signal)), signal: null, timeoutMs, jobId: null, ended: true };
|
|
25
28
|
const started = Date.now();
|
|
26
|
-
const run = await startProcess(ctx, sessionId, shell, line);
|
|
29
|
+
const run = await startProcess(ctx, sessionId, shell, line, options.notify === true);
|
|
27
30
|
return { output: run.output, exitCode: run.exitCode, signal: run.signal, timedOut: false, leftoverStopped: false, durationMs: Date.now() - started, timeoutMs, jobId: run.jobId, ended: run.ended };
|
|
28
31
|
}
|
|
29
32
|
/** What a line's run returns to the model (plan 08 §8.3, ADR 0012, 7). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-run.js","sourceRoot":"","sources":["../../src/calls/line-run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAY,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,wHAAwH;AACxH,qHAAqH;AAErH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IACrC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE;IACrB,eAAe,EAAE,CAAC,CAAC,OAAO,EAAE;IAC5B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE;CACnB,CAAC,CAAC;AAOH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,GAAQ,EAAE,SAAiB,EAAE,IAAY,EAAE,OAAoB;IAC3F,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO,EAAE,GAAG,CAAC,MAAM,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACnL,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"line-run.js","sourceRoot":"","sources":["../../src/calls/line-run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAY,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,wHAAwH;AACxH,qHAAqH;AAErH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IACrC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE;IACrB,eAAe,EAAE,CAAC,CAAC,OAAO,EAAE;IAC5B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE;CACnB,CAAC,CAAC;AAOH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,GAAQ,EAAE,SAAiB,EAAE,IAAY,EAAE,OAAoB;IAC3F,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI;QAAE,MAAM,OAAO,CAAC,+FAA+F,CAAC,CAAC;IAC3K,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO,EAAE,GAAG,CAAC,MAAM,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACnL,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;IACrF,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC;AACtM,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,WAAW,CAAC,GAAY;IACtC,IAAI,GAAG,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QAC1F,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,CAAC,GAAG,KAAK,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI;YAAE,OAAO,CAAC,GAAG,KAAK,EAAE,iCAAiC,EAAE,cAAc,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1H,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI;YAAE,OAAO,CAAC,GAAG,KAAK,EAAE,iCAAiC,EAAE,cAAc,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtH,OAAO,CAAC,GAAG,KAAK,EAAE,iCAAiC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,kCAAkC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9H,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,wGAAwG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACxK,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACxF,OAAO,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,cAAc,CAAC,GAAY;IACzC,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC;AACrD,CAAC;AAED,kHAAkH;AAClH,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC"}
|
package/dist/calls/run-tool.d.ts
CHANGED
|
@@ -19,11 +19,35 @@ export declare function runTool(connectors: readonly string[]): {
|
|
|
19
19
|
type: string;
|
|
20
20
|
description: string;
|
|
21
21
|
};
|
|
22
|
+
calls: {
|
|
23
|
+
type: string;
|
|
24
|
+
minItems: number;
|
|
25
|
+
maxItems: number;
|
|
26
|
+
description: string;
|
|
27
|
+
items: {
|
|
28
|
+
type: string;
|
|
29
|
+
properties: {
|
|
30
|
+
connector: {
|
|
31
|
+
type: string;
|
|
32
|
+
enum: string[];
|
|
33
|
+
};
|
|
34
|
+
command: {
|
|
35
|
+
type: string;
|
|
36
|
+
};
|
|
37
|
+
payload: {
|
|
38
|
+
type: string;
|
|
39
|
+
};
|
|
40
|
+
};
|
|
41
|
+
required: string[];
|
|
42
|
+
additionalProperties: boolean;
|
|
43
|
+
};
|
|
44
|
+
};
|
|
22
45
|
};
|
|
23
|
-
required: string[];
|
|
24
46
|
additionalProperties: boolean;
|
|
25
47
|
};
|
|
26
48
|
};
|
|
49
|
+
/** The calls one `run` may carry in `calls` (ADR 0108, 19). */
|
|
50
|
+
export declare const batchLimit = 20;
|
|
27
51
|
declare const argsSchema: z.ZodObject<{
|
|
28
52
|
connector: z.ZodString;
|
|
29
53
|
command: z.ZodString;
|
|
@@ -45,5 +69,18 @@ export declare function repairedArguments(raw: Record<string, JsonValue>, lineCo
|
|
|
45
69
|
* that run a line (`shell` and the binary ones), whose command may come as the line itself.
|
|
46
70
|
*/
|
|
47
71
|
export declare function parseRunArgs(raw: Record<string, JsonValue>, lineConnectors?: ReadonlySet<string>): ParsedRunArgs;
|
|
72
|
+
/** A reply's tool call block, as `expandedCalls` takes and gives it. */
|
|
73
|
+
export type ToolCallBlock = {
|
|
74
|
+
type: 'toolCall';
|
|
75
|
+
id: string;
|
|
76
|
+
name: string;
|
|
77
|
+
arguments: Record<string, JsonValue>;
|
|
78
|
+
};
|
|
79
|
+
/**
|
|
80
|
+
* A `run` with a `calls` list, as the reply stores it: one `run` call per entry, ids `<id>-1`, `<id>-2`, …, so each has
|
|
81
|
+
* its card, approval, and result as several calls in one reply do (ADR 0108, 19). A list with an invalid entry stays
|
|
82
|
+
* as it came, and its parse names the entry.
|
|
83
|
+
*/
|
|
84
|
+
export declare function expandedCalls(block: ToolCallBlock, lineConnectors: ReadonlySet<string>): ToolCallBlock[];
|
|
48
85
|
export {};
|
|
49
86
|
//# sourceMappingURL=run-tool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-tool.d.ts","sourceRoot":"","sources":["../../src/calls/run-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAOtD,wBAAgB,OAAO,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE
|
|
1
|
+
{"version":3,"file":"run-tool.d.ts","sourceRoot":"","sources":["../../src/calls/run-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAOtD,wBAAgB,OAAO,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BpD;AAED,+DAA+D;AAC/D,eAAO,MAAM,UAAU,KAAK,CAAC;AAI7B,QAAA,MAAM,UAAU;;;;kBAId,CAAC;AAEH,2EAA2E;AAC3E,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAoBlD,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AA0BpG,kIAAkI;AAClI,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAKhI;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,cAAc,GAAE,WAAW,CAAC,MAAM,CAAsB,GAAG,aAAa,CAWpI;AAED,wEAAwE;AACxE,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAAE,CAAC;AAIjH;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,EAAE,CAOxG"}
|
package/dist/calls/run-tool.js
CHANGED
|
@@ -10,6 +10,8 @@ export function runTool(connectors) {
|
|
|
10
10
|
'',
|
|
11
11
|
'Make every independent call in the same reply, as several run calls: reads and searches run at the same time, and each reply is a step that sends the whole conversation again.',
|
|
12
12
|
'',
|
|
13
|
+
'Several calls can also go in one run as { "calls": [{ connector, command, payload }, …] }, 1 to 20 of them, handled as that many run calls.',
|
|
14
|
+
'',
|
|
13
15
|
`For example, ${exampleCall}. Every connector has the command help: call it with an empty payload to see the connector's commands, or with { "command": "<name>" } to see one command's payload, before the first time you use a command whose payload the system prompt doesn't list.`,
|
|
14
16
|
].join('\n'),
|
|
15
17
|
parameters: {
|
|
@@ -18,12 +20,20 @@ export function runTool(connectors) {
|
|
|
18
20
|
connector: { type: 'string', enum: [...connectors], description: 'The connector to use.' },
|
|
19
21
|
command: { type: 'string', description: "One of the connector's commands, or help." },
|
|
20
22
|
payload: { type: 'object', description: "The command's input, as the system prompt or the connector's help gives it. Leave it out for a command that takes none." },
|
|
23
|
+
calls: {
|
|
24
|
+
type: 'array',
|
|
25
|
+
minItems: 1,
|
|
26
|
+
maxItems: batchLimit,
|
|
27
|
+
description: 'Several calls in place of connector, command, and payload, each handled as a run call of its own, in this order.',
|
|
28
|
+
items: { type: 'object', properties: { connector: { type: 'string', enum: [...connectors] }, command: { type: 'string' }, payload: { type: 'object' } }, required: ['connector', 'command'], additionalProperties: false },
|
|
29
|
+
},
|
|
21
30
|
},
|
|
22
|
-
required: ['connector', 'command'],
|
|
23
31
|
additionalProperties: false,
|
|
24
32
|
},
|
|
25
33
|
};
|
|
26
34
|
}
|
|
35
|
+
/** The calls one `run` may carry in `calls` (ADR 0108, 19). */
|
|
36
|
+
export const batchLimit = 20;
|
|
27
37
|
const payloadSchema = z.record(z.string(), z.json());
|
|
28
38
|
const argsSchema = z.strictObject({
|
|
29
39
|
connector: z.string().min(1),
|
|
@@ -77,6 +87,9 @@ function repaired(raw, lineConnectors) {
|
|
|
77
87
|
}
|
|
78
88
|
/** A `run` call's arguments as they are stored and sent again: repaired when the repair makes a valid call, else as they came. */
|
|
79
89
|
export function repairedArguments(raw, lineConnectors) {
|
|
90
|
+
// A `calls` list is repaired entry by entry when it is expanded.
|
|
91
|
+
if ('calls' in raw)
|
|
92
|
+
return raw;
|
|
80
93
|
const fixed = repaired(withParsedPayload(raw), lineConnectors);
|
|
81
94
|
return argsSchema.safeParse(fixed).success ? fixed : raw;
|
|
82
95
|
}
|
|
@@ -85,6 +98,8 @@ export function repairedArguments(raw, lineConnectors) {
|
|
|
85
98
|
* that run a line (`shell` and the binary ones), whose command may come as the line itself.
|
|
86
99
|
*/
|
|
87
100
|
export function parseRunArgs(raw, lineConnectors = new Set(['shell'])) {
|
|
101
|
+
if ('calls' in raw)
|
|
102
|
+
return { success: false, problems: batchProblems(raw, lineConnectors) };
|
|
88
103
|
const parsed = argsSchema.safeParse(repaired(withParsedPayload(raw), lineConnectors));
|
|
89
104
|
if (parsed.success)
|
|
90
105
|
return { success: true, data: parsed.data };
|
|
@@ -96,4 +111,34 @@ export function parseRunArgs(raw, lineConnectors = new Set(['shell'])) {
|
|
|
96
111
|
});
|
|
97
112
|
return { success: false, problems: problems.join('; ') };
|
|
98
113
|
}
|
|
114
|
+
const batchSchema = z.strictObject({ calls: z.array(z.record(z.string(), z.json())).min(1).max(batchLimit) });
|
|
115
|
+
/**
|
|
116
|
+
* A `run` with a `calls` list, as the reply stores it: one `run` call per entry, ids `<id>-1`, `<id>-2`, …, so each has
|
|
117
|
+
* its card, approval, and result as several calls in one reply do (ADR 0108, 19). A list with an invalid entry stays
|
|
118
|
+
* as it came, and its parse names the entry.
|
|
119
|
+
*/
|
|
120
|
+
export function expandedCalls(block, lineConnectors) {
|
|
121
|
+
if (block.name !== 'run')
|
|
122
|
+
return [block];
|
|
123
|
+
const batch = batchSchema.safeParse(block.arguments);
|
|
124
|
+
if (!batch.success)
|
|
125
|
+
return [block];
|
|
126
|
+
const entries = batch.data.calls.map((entry) => repairedArguments(entry, lineConnectors));
|
|
127
|
+
if (!entries.every((entry) => argsSchema.safeParse(entry).success))
|
|
128
|
+
return [block];
|
|
129
|
+
return entries.map((entry, index) => ({ type: 'toolCall', id: `${block.id}-${String(index + 1)}`, name: 'run', arguments: entry }));
|
|
130
|
+
}
|
|
131
|
+
// What is wrong with a `calls` list that wasn't made into calls.
|
|
132
|
+
function batchProblems(raw, lineConnectors) {
|
|
133
|
+
if ('connector' in raw || 'command' in raw || 'payload' in raw)
|
|
134
|
+
return 'calls: send either connector, command, and payload, or calls, not both';
|
|
135
|
+
const batch = batchSchema.safeParse(raw);
|
|
136
|
+
if (!batch.success)
|
|
137
|
+
return `calls: a list of 1 to ${String(batchLimit)} calls, each { connector, command, payload? }`;
|
|
138
|
+
const failed = batch.data.calls.findIndex((entry) => !argsSchema.safeParse(repairedArguments(entry, lineConnectors)).success);
|
|
139
|
+
const entry = batch.data.calls[failed] ?? {};
|
|
140
|
+
const parsed = argsSchema.safeParse(repaired(withParsedPayload(entry), lineConnectors));
|
|
141
|
+
const why = parsed.success ? 'invalid' : parsed.error.issues.map((issue) => `${issue.path.join('.') || 'arguments'}: ${issue.message}`).join('; ');
|
|
142
|
+
return `calls[${String(failed + 1)}]: ${why}; none of the calls ran`;
|
|
143
|
+
}
|
|
99
144
|
//# sourceMappingURL=run-tool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-tool.js","sourceRoot":"","sources":["../../src/calls/run-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAG/B,wHAAwH;AACxH,mIAAmI;AAEnI,MAAM,WAAW,GAAG,wEAAwE,CAAC;AAE7F,MAAM,UAAU,OAAO,CAAC,UAA6B;IACnD,OAAO;QACL,IAAI,EAAE,KAAK;QACX,WAAW,EAAE;YACX,kJAAkJ;YAClJ,EAAE;YACF,iLAAiL;YACjL,EAAE;YACF,gBAAgB,WAAW,4PAA4P;SACxR,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAG,UAAU,CAAC,EAAE,WAAW,EAAE,uBAAuB,EAAE;gBAC1F,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,2CAA2C,EAAE;gBACrF,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,yHAAyH,EAAE;
|
|
1
|
+
{"version":3,"file":"run-tool.js","sourceRoot":"","sources":["../../src/calls/run-tool.ts"],"names":[],"mappings":"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"}
|
package/dist/connector-call.d.ts
CHANGED
|
@@ -22,11 +22,14 @@ export type PayloadIssue = {
|
|
|
22
22
|
};
|
|
23
23
|
/** A payload's signature written from its JSON Schema, such as `{ a, b? (≤300), c: [{ x }] }`; `undefined` when the schema isn't an object with properties. */
|
|
24
24
|
export declare function payloadSignature(schema: Json | undefined): string | undefined;
|
|
25
|
-
/**
|
|
25
|
+
/**
|
|
26
|
+
* An invalid payload as the model reads it: each problem, then the command's signature so one correction is enough
|
|
27
|
+
* (ADR 0012, 2 to 4), then the command's help, so no help call is needed (ADR 0108, 14).
|
|
28
|
+
*/
|
|
26
29
|
export declare function invalidPayloadOutput(call: {
|
|
27
30
|
connector: string;
|
|
28
31
|
command: string;
|
|
29
|
-
}, issues: readonly PayloadIssue[], schema: Json | undefined): CallResult;
|
|
32
|
+
}, issues: readonly PayloadIssue[], schema: Json | undefined, help?: string): CallResult;
|
|
30
33
|
/** One run of a connector's command: how to run it, and how to find its payload schema when the payload doesn't fit. */
|
|
31
34
|
export type CommandRun = {
|
|
32
35
|
connector: string;
|
|
@@ -35,6 +38,8 @@ export type CommandRun = {
|
|
|
35
38
|
payloadPath: string;
|
|
36
39
|
exec(): Promise<unknown>;
|
|
37
40
|
payloadSchema(): Promise<Json | undefined>;
|
|
41
|
+
/** The command's help text, added to an invalid payload's error. */
|
|
42
|
+
help(): Promise<string | undefined>;
|
|
38
43
|
/** Whether the calling job was cancelled, so its Problem is rethrown instead of returned. */
|
|
39
44
|
cancelled(): boolean;
|
|
40
45
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector-call.d.ts","sourceRoot":"","sources":["../src/connector-call.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,CAAC,EAAE,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAKtE,qCAAqC;AACrC,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAE5D,2EAA2E;AAC3E,MAAM,MAAM,UAAU,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9D,8EAA8E;AAC9E,eAAO,MAAM,iBAAiB,sGAAuG,CAAC;AAEtI,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,gDAAgD;AAChD,wBAAgB,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,UAAU,CAElF;AAED,4EAA4E;AAC5E,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAErD;AAED,eAAO,MAAM,kBAAkB,GAAI,WAAW,MAAM,EAAE,OAAO,SAAS,MAAM,EAAE,KAAG,MAAwF,CAAC;AAI1K,oJAAoJ;AACpJ,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAKxG;AAED,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AA6C7D,+JAA+J;AAC/J,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAI7E;AAOD
|
|
1
|
+
{"version":3,"file":"connector-call.d.ts","sourceRoot":"","sources":["../src/connector-call.ts"],"names":[],"mappings":"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"}
|
package/dist/connector-call.js
CHANGED
|
@@ -59,15 +59,18 @@ function withoutSchemaKey(schema) {
|
|
|
59
59
|
return schema;
|
|
60
60
|
return Object.fromEntries(Object.entries(schema).filter(([key]) => key !== '$schema'));
|
|
61
61
|
}
|
|
62
|
-
/**
|
|
63
|
-
|
|
62
|
+
/**
|
|
63
|
+
* An invalid payload as the model reads it: each problem, then the command's signature so one correction is enough
|
|
64
|
+
* (ADR 0012, 2 to 4), then the command's help, so no help call is needed (ADR 0108, 14).
|
|
65
|
+
*/
|
|
66
|
+
export function invalidPayloadOutput(call, issues, schema, help) {
|
|
64
67
|
const problems = issues.map((issue) => `${issue.path === '' ? 'payload' : issue.path}: ${issue.message}`).join('; ');
|
|
65
68
|
let shape = '';
|
|
66
69
|
if (schema !== undefined) {
|
|
67
70
|
const signature = payloadSignature(schema);
|
|
68
71
|
shape = signature === undefined ? ` The payload of ${call.connector} ${call.command} is (JSON Schema):\n${JSON.stringify(withoutSchemaKey(schema))}` : ` The payload of ${call.connector} ${call.command} is\n${signature}`;
|
|
69
72
|
}
|
|
70
|
-
return errorOutput({ code: 'VALIDATION_FAILED', message: `${problems}.${shape}` });
|
|
73
|
+
return errorOutput({ code: 'VALIDATION_FAILED', message: `${problems}.${shape}${help === undefined ? '' : `\n\n${help}`}` });
|
|
71
74
|
}
|
|
72
75
|
const kernelIssuesSchema = z.object({ issues: z.array(z.object({ path: z.string(), message: z.string() })).min(1) });
|
|
73
76
|
// The kernel's issue paths start at the job's input; a built-in command's payload is the input's `payload` field.
|
|
@@ -90,7 +93,7 @@ export async function runCommand(run) {
|
|
|
90
93
|
if (invalid?.success !== true)
|
|
91
94
|
return { ok: false, result: errorOutput(error.problem) };
|
|
92
95
|
const issues = invalid.data.issues.map((issue) => ({ path: withoutPrefix(issue.path, run.payloadPath), message: issue.message }));
|
|
93
|
-
return { ok: false, result: invalidPayloadOutput(run, issues, await run.payloadSchema()) };
|
|
96
|
+
return { ok: false, result: invalidPayloadOutput(run, issues, await run.payloadSchema(), await run.help()) };
|
|
94
97
|
}
|
|
95
98
|
}
|
|
96
99
|
const connectorListSchema = z.array(z.object({ name: z.string(), kind: z.enum(['commands', 'binary']), commands: z.array(z.object({ name: z.string(), command: z.string() })).exactOptional() }));
|
|
@@ -130,6 +133,7 @@ export async function runConnector(kernel, call, options = {}) {
|
|
|
130
133
|
payloadPath: '',
|
|
131
134
|
exec: () => kernel.exec(target.command, payload, as),
|
|
132
135
|
payloadSchema: async () => extensionsSchema.parse(await kernel.exec('kernel.extensions.list', {}, as)).flatMap((extension) => [...extension.commands, ...extension.queries]).find((registered) => registered.name === target.command)?.input,
|
|
136
|
+
help: async () => helpSchema.parse(await kernel.exec('kvcoder.connector.help.get', { connector: call.connector, command: call.command }, as)).text,
|
|
133
137
|
cancelled: () => false,
|
|
134
138
|
});
|
|
135
139
|
return done.ok ? jsonOutput(done.value) : done.result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector-call.js","sourceRoot":"","sources":["../src/connector-call.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connector-call.js","sourceRoot":"","sources":["../src/connector-call.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifact.d.ts","sourceRoot":"","sources":["../../src/connectors/artifact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,eAAe,EAA4B,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"artifact.d.ts","sourceRoot":"","sources":["../../src/connectors/artifact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,eAAe,EAA4B,MAAM,iCAAiC,CAAC;AAiB5F,yDAAyD;AACzD,eAAO,MAAM,mBAAmB,4nCACgmC,CAAC;AAqBjoC,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKe,CAAC;AAgD7C,uHAAuH;AACvH,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAGzL;AAID,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAmCxD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { z } from '@kvman/sdk';
|
|
2
2
|
import { artifactFormats, contentFor, detectFormat } from "../artifacts/artifact-format.js";
|
|
3
3
|
import { artifactCountLimit, assertWithinLimit, chatIdOf } from "../artifacts/artifact-records.js";
|
|
4
|
+
import { endedUrlArtifact } from "../artifacts/ended-url.js";
|
|
4
5
|
import { deleteArtifact } from "../artifacts/delete-artifact.js";
|
|
5
6
|
import { applyEdits } from "../files/edit-text.js";
|
|
6
7
|
import { notFound, tooLarge } from "../problems.js";
|
|
@@ -38,8 +39,9 @@ export const artifactCommands = {
|
|
|
38
39
|
const missing = (id) => notFound(`The artifact ${id} doesn't exist.`, { id });
|
|
39
40
|
// An artifact belongs to its chat, so a subagent's belongs to the chat at its root.
|
|
40
41
|
const chatOf = async (ctx, sessionId) => chatIdOf(await findSession(ctx, sessionId));
|
|
41
|
-
function writeArtifact(ctx, chatId, input) {
|
|
42
|
+
async function writeArtifact(ctx, chatId, input) {
|
|
42
43
|
const format = input.format ?? detectFormat(input.content);
|
|
44
|
+
const replaced = format === 'url' ? await endedUrlArtifact(ctx, chatId, input.id) : undefined;
|
|
43
45
|
return ctx.store.transaction((tx) => {
|
|
44
46
|
const content = contentFor(format, input.content);
|
|
45
47
|
assertWithinLimit(input.id, content);
|
|
@@ -47,6 +49,12 @@ function writeArtifact(ctx, chatId, input) {
|
|
|
47
49
|
const existing = artifacts.find({ sessionId: chatId, artifactId: input.id }, { limit: 1 })[0];
|
|
48
50
|
const stamp = now();
|
|
49
51
|
if (existing === undefined) {
|
|
52
|
+
const ended = replaced === undefined ? undefined : artifacts.find({ sessionId: chatId, artifactId: replaced }, { limit: 1 })[0];
|
|
53
|
+
if (ended !== undefined && artifacts.count({ sessionId: chatId }) >= artifactCountLimit) {
|
|
54
|
+
artifacts.delete(ended.id);
|
|
55
|
+
artifacts.insert({ sessionId: chatId, artifactId: input.id, title: input.title, format, content, version: 1, createdAt: stamp, updatedAt: stamp });
|
|
56
|
+
return { id: input.id, version: 1, created: true, bytes: Buffer.byteLength(content), replaced: ended.artifactId };
|
|
57
|
+
}
|
|
50
58
|
if (artifacts.count({ sessionId: chatId }) >= artifactCountLimit)
|
|
51
59
|
throw tooLarge(`This chat already has ${artifactCountLimit} artifacts. Update one that exists (artifact list names them), or delete one.`, artifactCountLimit);
|
|
52
60
|
artifacts.insert({ sessionId: chatId, artifactId: input.id, title: input.title, format, content, version: 1, createdAt: stamp, updatedAt: stamp });
|
|
@@ -79,7 +87,7 @@ export function registerArtifactConnector(ctx) {
|
|
|
79
87
|
ctx.registerCommand('kvcoder.artifact.write', {
|
|
80
88
|
description: commands.write.description,
|
|
81
89
|
input: callInput(payloads.write),
|
|
82
|
-
output: z.object({ id: z.string(), version: z.number().int(), created: z.boolean(), bytes: z.number().int() }),
|
|
90
|
+
output: z.object({ id: z.string(), version: z.number().int(), created: z.boolean(), bytes: z.number().int(), replaced: z.string().exactOptional() }),
|
|
83
91
|
public: true,
|
|
84
92
|
retries: 0,
|
|
85
93
|
handle: async ({ sessionId, payload }) => writeArtifact(ctx, await chatOf(ctx, sessionId), payload),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../src/connectors/artifact.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../src/connectors/artifact.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { z, type Ctx } from '@kvman/sdk';
|
|
2
2
|
/** What the prompt's index says the connector is for. */
|
|
3
|
-
export declare const backgroundDescription = "Follow up on what
|
|
3
|
+
export declare const backgroundDescription = "Follow up on what runs in the background: a server or other long-running shell line you started with background set to true, or a helper. Use it to see its status or output, to wait for a process to end, or to stop a run. When you need a process's result before you can go on, call wait once: asking for its output again and again fills the conversation, and a run that ends tells you in a message anyway. Never wait for a helper: its answer wakes you.";
|
|
4
4
|
/** How long `wait` waits when the call names no time, the most it waits, and how often it looks. */
|
|
5
5
|
export declare const waitDefaultMs = 120000;
|
|
6
6
|
export declare const waitLimitMs = 600000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"background.d.ts","sourceRoot":"","sources":["../../src/connectors/background.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"background.d.ts","sourceRoot":"","sources":["../../src/connectors/background.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAWzC,yDAAyD;AACzD,eAAO,MAAM,qBAAqB,ycACua,CAAC;AAK1c,oGAAoG;AACpG,eAAO,MAAM,aAAa,SAAU,CAAC;AACrC,eAAO,MAAM,WAAW,SAAU,CAAC;AAcnC,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKa,CAAC;AAwB7C,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CA+C1D"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { z } from '@kvman/sdk';
|
|
2
2
|
import { delay } from "../delay.js";
|
|
3
|
-
import { cancelJob, jobDetail, jobRows } from "../jobs/job-rows.js";
|
|
3
|
+
import { cancelJob, isActive, jobDetail, jobRows } from "../jobs/job-rows.js";
|
|
4
4
|
import { records } from "../store/collections.js";
|
|
5
|
+
import { markEndingRead } from "../turns/read-endings.js";
|
|
5
6
|
import { callInput } from "./connector-command.js";
|
|
6
7
|
import { cutInto } from "./payload-fields.js";
|
|
7
8
|
// The `background` connector (plan 08 §8.5, ADR 0011, 6): what this chat started with `background: true`, a process or
|
|
8
9
|
// a subagent, listed, read, waited for, or stopped by the id the starting call returned. The agent sees no kernel job.
|
|
9
10
|
/** What the prompt's index says the connector is for. */
|
|
10
|
-
export const backgroundDescription = 'Follow up on what
|
|
11
|
+
export const backgroundDescription = 'Follow up on what runs in the background: a server or other long-running shell line you started with background set to true, or a helper. Use it to see its status or output, to wait for a process to end, or to stop a run. When you need a process\'s result before you can go on, call wait once: asking for its output again and again fills the conversation, and a run that ends tells you in a message anyway. Never wait for a helper: its answer wakes you.';
|
|
11
12
|
const id = z.string().min(1).describe('The id that the call which started the work returned.');
|
|
12
13
|
const started = z.strictObject({ id });
|
|
13
14
|
/** How long `wait` waits when the call names no time, the most it waits, and how often it looks. */
|
|
@@ -82,6 +83,8 @@ export function registerBackgroundConnector(ctx) {
|
|
|
82
83
|
ctx.job.signal.throwIfAborted();
|
|
83
84
|
found = await startedBy(ctx, sessionId, payload.id);
|
|
84
85
|
}
|
|
86
|
+
if (!isActive(found.row.status))
|
|
87
|
+
await markEndingRead(ctx, sessionId, payload.id);
|
|
85
88
|
return { ...forAgent(found.row), ...found.detail };
|
|
86
89
|
},
|
|
87
90
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"background.js","sourceRoot":"","sources":["../../src/connectors/background.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAY,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"background.js","sourceRoot":"","sources":["../../src/connectors/background.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,11 @@ import { lineRunOptions, lineRunSchema, runLine } from "../calls/line-run.js";
|
|
|
3
3
|
import { notFound } from "../problems.js";
|
|
4
4
|
import { activeConnectors } from "../registry/register-connectors.js";
|
|
5
5
|
import { lineCallInput, lineResult } from "./connector-command.js";
|
|
6
|
-
import { background, risky, timeoutMs } from "./payload-fields.js";
|
|
6
|
+
import { background, notify, risky, timeoutMs } from "./payload-fields.js";
|
|
7
7
|
// A binary connector (plan 08 §8.4, ADR 0011, 5): a program on the system, registered by an extension or named in
|
|
8
8
|
// `kvcoder.connectors`. Every one has the same command besides `help`: `exec` runs `<name> <args>` in the real shell,
|
|
9
9
|
// with the approval, timeout, and background rules of `shell exec`.
|
|
10
|
-
const execPayload = z.strictObject({ args: z.string().describe("The program's arguments, as you would type them after its name.").exactOptional(), background, timeoutMs, risky });
|
|
10
|
+
const execPayload = z.strictObject({ args: z.string().describe("The program's arguments, as you would type them after its name.").exactOptional(), background, notify, timeoutMs, risky });
|
|
11
11
|
export const binaryExec = { registration: 'kvcoder.binary.run', description: 'Runs the program with the given arguments in the real shell, in the workspace folder.', payload: execPayload, asks: true, result: lineResult };
|
|
12
12
|
export function registerBinaryConnector(ctx) {
|
|
13
13
|
ctx.registerCommand('kvcoder.binary.run', {
|