@kvman/kvcoder 0.1.5 → 0.1.7
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/api.d.ts +49 -3
- package/dist/api.d.ts.map +1 -1
- package/dist/calls/run-shell.d.ts.map +1 -1
- package/dist/calls/run-shell.js +39 -9
- package/dist/calls/run-shell.js.map +1 -1
- package/dist/connector-call.d.ts +1 -1
- package/dist/connector-call.d.ts.map +1 -1
- package/dist/connector-call.js +4 -2
- package/dist/connector-call.js.map +1 -1
- package/dist/connectors/artifact.d.ts +1 -1
- package/dist/connectors/artifact.d.ts.map +1 -1
- package/dist/connectors/artifact.js +4 -4
- package/dist/connectors/artifact.js.map +1 -1
- package/dist/connectors/ask.d.ts +24 -0
- package/dist/connectors/ask.d.ts.map +1 -1
- package/dist/connectors/ask.js +20 -11
- package/dist/connectors/ask.js.map +1 -1
- package/dist/connectors/background.d.ts +14 -1
- package/dist/connectors/background.d.ts.map +1 -1
- package/dist/connectors/background.js +53 -23
- package/dist/connectors/background.js.map +1 -1
- package/dist/connectors/builtin-connectors.d.ts +111 -0
- package/dist/connectors/builtin-connectors.d.ts.map +1 -1
- package/dist/connectors/builtin-connectors.js +4 -1
- package/dist/connectors/builtin-connectors.js.map +1 -1
- package/dist/connectors/delegate.d.ts +9 -3
- package/dist/connectors/delegate.d.ts.map +1 -1
- package/dist/connectors/delegate.js +29 -10
- package/dist/connectors/delegate.js.map +1 -1
- package/dist/connectors/execution-map.d.ts +62 -0
- package/dist/connectors/execution-map.d.ts.map +1 -0
- package/dist/connectors/execution-map.js +142 -0
- package/dist/connectors/execution-map.js.map +1 -0
- package/dist/connectors/fs.d.ts +32 -1
- package/dist/connectors/fs.d.ts.map +1 -1
- package/dist/connectors/fs.js +76 -45
- package/dist/connectors/fs.js.map +1 -1
- package/dist/connectors/mcp.d.ts +18 -1
- package/dist/connectors/mcp.d.ts.map +1 -1
- package/dist/connectors/mcp.js +54 -6
- package/dist/connectors/mcp.js.map +1 -1
- package/dist/connectors/payload-fields.d.ts.map +1 -1
- package/dist/connectors/payload-fields.js +1 -1
- package/dist/connectors/payload-fields.js.map +1 -1
- package/dist/delegate/approved-run.d.ts +4 -6
- package/dist/delegate/approved-run.d.ts.map +1 -1
- package/dist/delegate/approved-run.js +74 -34
- package/dist/delegate/approved-run.js.map +1 -1
- package/dist/delegate/git-staging.d.ts +12 -0
- package/dist/delegate/git-staging.d.ts.map +1 -0
- package/dist/delegate/git-staging.js +54 -0
- package/dist/delegate/git-staging.js.map +1 -0
- package/dist/delegate/permission.d.ts +240 -0
- package/dist/delegate/permission.d.ts.map +1 -0
- package/dist/delegate/permission.js +78 -0
- package/dist/delegate/permission.js.map +1 -0
- package/dist/delegate/program-permission.d.ts +27 -0
- package/dist/delegate/program-permission.d.ts.map +1 -0
- package/dist/delegate/program-permission.js +53 -0
- package/dist/delegate/program-permission.js.map +1 -0
- package/dist/delegate/register-worker-run.d.ts.map +1 -1
- package/dist/delegate/register-worker-run.js +27 -11
- package/dist/delegate/register-worker-run.js.map +1 -1
- package/dist/delegate/run-program.d.ts.map +1 -1
- package/dist/delegate/run-program.js +29 -8
- package/dist/delegate/run-program.js.map +1 -1
- package/dist/delegate/runs.d.ts +14 -4
- package/dist/delegate/runs.d.ts.map +1 -1
- package/dist/delegate/runs.js +49 -19
- package/dist/delegate/runs.js.map +1 -1
- package/dist/delegate/staging-guard.d.ts +9 -0
- package/dist/delegate/staging-guard.d.ts.map +1 -0
- package/dist/delegate/staging-guard.js +55 -0
- package/dist/delegate/staging-guard.js.map +1 -0
- package/dist/delegate/start-background.d.ts +7 -0
- package/dist/delegate/start-background.d.ts.map +1 -0
- package/dist/delegate/start-background.js +32 -0
- package/dist/delegate/start-background.js.map +1 -0
- package/dist/delegate/start-pending.d.ts +5 -0
- package/dist/delegate/start-pending.d.ts.map +1 -0
- package/dist/delegate/start-pending.js +42 -0
- package/dist/delegate/start-pending.js.map +1 -0
- package/dist/delegate/workers.d.ts +5 -2
- package/dist/delegate/workers.d.ts.map +1 -1
- package/dist/delegate/workers.js +44 -8
- package/dist/delegate/workers.js.map +1 -1
- package/dist/files/file-change.d.ts +28 -0
- package/dist/files/file-change.d.ts.map +1 -0
- package/dist/files/file-change.js +125 -0
- package/dist/files/file-change.js.map +1 -0
- package/dist/files/file-parts.d.ts +18 -0
- package/dist/files/file-parts.d.ts.map +1 -0
- package/dist/files/file-parts.js +40 -0
- package/dist/files/file-parts.js.map +1 -0
- package/dist/files/read-file.d.ts +9 -1
- package/dist/files/read-file.d.ts.map +1 -1
- package/dist/files/read-file.js +35 -13
- package/dist/files/read-file.js.map +1 -1
- package/dist/files/search-text.d.ts +12 -2
- package/dist/files/search-text.d.ts.map +1 -1
- package/dist/files/search-text.js +87 -23
- package/dist/files/search-text.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/job-rows.d.ts +11 -2
- package/dist/jobs/job-rows.d.ts.map +1 -1
- package/dist/jobs/job-rows.js +25 -14
- package/dist/jobs/job-rows.js.map +1 -1
- package/dist/jobs/process-handlers.d.ts.map +1 -1
- package/dist/jobs/process-handlers.js +12 -1
- package/dist/jobs/process-handlers.js.map +1 -1
- package/dist/jobs/process-report.d.ts.map +1 -1
- package/dist/jobs/process-report.js +2 -1
- package/dist/jobs/process-report.js.map +1 -1
- package/dist/jobs/process-run.d.ts.map +1 -1
- package/dist/jobs/process-run.js +2 -1
- package/dist/jobs/process-run.js.map +1 -1
- package/dist/jobs/register-jobs.d.ts.map +1 -1
- package/dist/jobs/register-jobs.js +1 -0
- package/dist/jobs/register-jobs.js.map +1 -1
- package/dist/maps/map-reminder.d.ts +7 -0
- package/dist/maps/map-reminder.d.ts.map +1 -0
- package/dist/maps/map-reminder.js +24 -0
- package/dist/maps/map-reminder.js.map +1 -0
- package/dist/maps/map-rules.d.ts +36 -0
- package/dist/maps/map-rules.d.ts.map +1 -0
- package/dist/maps/map-rules.js +86 -0
- package/dist/maps/map-rules.js.map +1 -0
- package/dist/maps/map-schema.d.ts +55 -0
- package/dist/maps/map-schema.d.ts.map +1 -0
- package/dist/maps/map-schema.js +27 -0
- package/dist/maps/map-schema.js.map +1 -0
- package/dist/maps/register-maps.d.ts +3 -0
- package/dist/maps/register-maps.d.ts.map +1 -0
- package/dist/maps/register-maps.js +21 -0
- package/dist/maps/register-maps.js.map +1 -0
- package/dist/mcp/connect.d.ts +2 -0
- package/dist/mcp/connect.d.ts.map +1 -1
- package/dist/mcp/connect.js +16 -4
- package/dist/mcp/connect.js.map +1 -1
- package/dist/mcp/oauth-provider.d.ts +8 -5
- package/dist/mcp/oauth-provider.d.ts.map +1 -1
- package/dist/mcp/oauth-provider.js +31 -22
- package/dist/mcp/oauth-provider.js.map +1 -1
- package/dist/mcp/secrets.d.ts +2 -0
- package/dist/mcp/secrets.d.ts.map +1 -1
- package/dist/mcp/secrets.js +6 -0
- package/dist/mcp/secrets.js.map +1 -1
- package/dist/mcp/sign-in.d.ts.map +1 -1
- package/dist/mcp/sign-in.js +12 -4
- package/dist/mcp/sign-in.js.map +1 -1
- package/dist/messages/receive-message.d.ts +2 -1
- package/dist/messages/receive-message.d.ts.map +1 -1
- package/dist/messages/receive-message.js +34 -9
- package/dist/messages/receive-message.js.map +1 -1
- package/dist/messages/register-messages.d.ts.map +1 -1
- package/dist/messages/register-messages.js +13 -8
- package/dist/messages/register-messages.js.map +1 -1
- package/dist/messages/send-receipt.d.ts +10 -0
- package/dist/messages/send-receipt.d.ts.map +1 -0
- package/dist/messages/send-receipt.js +14 -0
- package/dist/messages/send-receipt.js.map +1 -0
- package/dist/prompt/build-prompt.d.ts +1 -0
- package/dist/prompt/build-prompt.d.ts.map +1 -1
- package/dist/prompt/build-prompt.js +5 -1
- package/dist/prompt/build-prompt.js.map +1 -1
- package/dist/prompt/project-rules.d.ts +6 -0
- package/dist/prompt/project-rules.d.ts.map +1 -0
- package/dist/prompt/project-rules.js +37 -0
- package/dist/prompt/project-rules.js.map +1 -0
- package/dist/prompt/session-grants.d.ts +209 -0
- package/dist/prompt/session-grants.d.ts.map +1 -0
- package/dist/prompt/session-grants.js +50 -0
- package/dist/prompt/session-grants.js.map +1 -0
- package/dist/prompt/session-prompt.d.ts +3 -2
- package/dist/prompt/session-prompt.d.ts.map +1 -1
- package/dist/prompt/session-prompt.js +24 -40
- package/dist/prompt/session-prompt.js.map +1 -1
- package/dist/prompt/working-method.d.ts.map +1 -1
- package/dist/prompt/working-method.js +22 -16
- package/dist/prompt/working-method.js.map +1 -1
- package/dist/register-settings.d.ts +3 -1
- package/dist/register-settings.d.ts.map +1 -1
- package/dist/register-settings.js +5 -4
- package/dist/register-settings.js.map +1 -1
- package/dist/registry/register-connectors.d.ts +9 -0
- package/dist/registry/register-connectors.d.ts.map +1 -1
- package/dist/registry/register-connectors.js +20 -12
- package/dist/registry/register-connectors.js.map +1 -1
- package/dist/result-text.d.ts +4 -0
- package/dist/result-text.d.ts.map +1 -1
- package/dist/result-text.js +9 -0
- package/dist/result-text.js.map +1 -1
- package/dist/schemas/records.d.ts +142 -0
- package/dist/schemas/records.d.ts.map +1 -1
- package/dist/schemas/records.js +60 -2
- package/dist/schemas/records.js.map +1 -1
- package/dist/sessions/execution-root.d.ts +8 -0
- package/dist/sessions/execution-root.d.ts.map +1 -0
- package/dist/sessions/execution-root.js +25 -0
- package/dist/sessions/execution-root.js.map +1 -0
- package/dist/sessions/new-session.d.ts +5 -1
- package/dist/sessions/new-session.d.ts.map +1 -1
- package/dist/sessions/new-session.js +17 -4
- package/dist/sessions/new-session.js.map +1 -1
- package/dist/sessions/register-context.d.ts.map +1 -1
- package/dist/sessions/register-context.js +6 -5
- package/dist/sessions/register-context.js.map +1 -1
- package/dist/sessions/register-fork-export.d.ts.map +1 -1
- package/dist/sessions/register-fork-export.js +5 -3
- package/dist/sessions/register-fork-export.js.map +1 -1
- package/dist/sessions/register-lifecycle.d.ts.map +1 -1
- package/dist/sessions/register-lifecycle.js +14 -5
- package/dist/sessions/register-lifecycle.js.map +1 -1
- package/dist/sessions/register-sessions.d.ts.map +1 -1
- package/dist/sessions/register-sessions.js +0 -2
- package/dist/sessions/register-sessions.js.map +1 -1
- package/dist/sessions/session-view.d.ts +23 -0
- package/dist/sessions/session-view.d.ts.map +1 -1
- package/dist/sessions/session-view.js +4 -1
- package/dist/sessions/session-view.js.map +1 -1
- package/dist/store/all-docs.d.ts +4 -0
- package/dist/store/all-docs.d.ts.map +1 -0
- package/dist/store/all-docs.js +14 -0
- package/dist/store/all-docs.js.map +1 -0
- package/dist/store/collections.d.ts +230 -0
- package/dist/store/collections.d.ts.map +1 -1
- package/dist/store/collections.js +16 -1
- package/dist/store/collections.js.map +1 -1
- package/dist/turns/answer-fingerprint.d.ts +4 -0
- package/dist/turns/answer-fingerprint.d.ts.map +1 -0
- package/dist/turns/answer-fingerprint.js +18 -0
- package/dist/turns/answer-fingerprint.js.map +1 -0
- package/dist/turns/apply-answer.d.ts +19 -0
- package/dist/turns/apply-answer.d.ts.map +1 -0
- package/dist/turns/apply-answer.js +47 -0
- package/dist/turns/apply-answer.js.map +1 -0
- package/dist/turns/background.d.ts +3 -0
- package/dist/turns/background.d.ts.map +1 -1
- package/dist/turns/background.js +13 -12
- package/dist/turns/background.js.map +1 -1
- package/dist/turns/call-groups.d.ts +9 -0
- package/dist/turns/call-groups.d.ts.map +1 -0
- package/dist/turns/call-groups.js +18 -0
- package/dist/turns/call-groups.js.map +1 -0
- package/dist/turns/call-permission.d.ts +22 -0
- package/dist/turns/call-permission.d.ts.map +1 -0
- package/dist/turns/call-permission.js +49 -0
- package/dist/turns/call-permission.js.map +1 -0
- package/dist/turns/cancel-step-job.d.ts +14 -0
- package/dist/turns/cancel-step-job.d.ts.map +1 -0
- package/dist/turns/cancel-step-job.js +35 -0
- package/dist/turns/cancel-step-job.js.map +1 -0
- package/dist/turns/child-result.d.ts +7 -0
- package/dist/turns/child-result.d.ts.map +1 -0
- package/dist/turns/child-result.js +24 -0
- package/dist/turns/child-result.js.map +1 -0
- package/dist/turns/compaction.d.ts +15 -1
- package/dist/turns/compaction.d.ts.map +1 -1
- package/dist/turns/compaction.js +48 -18
- package/dist/turns/compaction.js.map +1 -1
- package/dist/turns/end-turn-state.d.ts +42 -0
- package/dist/turns/end-turn-state.d.ts.map +1 -0
- package/dist/turns/end-turn-state.js +64 -0
- package/dist/turns/end-turn-state.js.map +1 -0
- package/dist/turns/end-turn.d.ts +7 -8
- package/dist/turns/end-turn.d.ts.map +1 -1
- package/dist/turns/end-turn.js +52 -55
- package/dist/turns/end-turn.js.map +1 -1
- package/dist/turns/helper-calls.d.ts +6 -0
- package/dist/turns/helper-calls.d.ts.map +1 -0
- package/dist/turns/helper-calls.js +8 -0
- package/dist/turns/helper-calls.js.map +1 -0
- package/dist/turns/history.d.ts +3 -1
- package/dist/turns/history.d.ts.map +1 -1
- package/dist/turns/history.js +15 -7
- package/dist/turns/history.js.map +1 -1
- package/dist/turns/lost-reply.d.ts +7 -0
- package/dist/turns/lost-reply.d.ts.map +1 -1
- package/dist/turns/lost-reply.js +12 -0
- package/dist/turns/lost-reply.js.map +1 -1
- package/dist/turns/message-blocks.d.ts +2 -0
- package/dist/turns/message-blocks.d.ts.map +1 -1
- package/dist/turns/message-blocks.js +7 -0
- package/dist/turns/message-blocks.js.map +1 -1
- package/dist/turns/model-context.d.ts +2 -0
- package/dist/turns/model-context.d.ts.map +1 -1
- package/dist/turns/model-context.js +29 -5
- package/dist/turns/model-context.js.map +1 -1
- package/dist/turns/model-retry.d.ts +2 -1
- package/dist/turns/model-retry.d.ts.map +1 -1
- package/dist/turns/model-retry.js +5 -1
- package/dist/turns/model-retry.js.map +1 -1
- package/dist/turns/read-only.d.ts +6 -0
- package/dist/turns/read-only.d.ts.map +1 -0
- package/dist/turns/read-only.js +12 -0
- package/dist/turns/read-only.js.map +1 -0
- package/dist/turns/receipt-job.d.ts +5 -0
- package/dist/turns/receipt-job.d.ts.map +1 -0
- package/dist/turns/receipt-job.js +40 -0
- package/dist/turns/receipt-job.js.map +1 -0
- package/dist/turns/recover-workspace.d.ts +9 -0
- package/dist/turns/recover-workspace.d.ts.map +1 -0
- package/dist/turns/recover-workspace.js +79 -0
- package/dist/turns/recover-workspace.js.map +1 -0
- package/dist/turns/recovery-state.d.ts +19 -0
- package/dist/turns/recovery-state.d.ts.map +1 -0
- package/dist/turns/recovery-state.js +87 -0
- package/dist/turns/recovery-state.js.map +1 -0
- package/dist/turns/register-interruptions.d.ts.map +1 -1
- package/dist/turns/register-interruptions.js +19 -8
- package/dist/turns/register-interruptions.js.map +1 -1
- package/dist/turns/register-turns.d.ts.map +1 -1
- package/dist/turns/register-turns.js +42 -31
- package/dist/turns/register-turns.js.map +1 -1
- package/dist/turns/resolve.d.ts +4 -0
- package/dist/turns/resolve.d.ts.map +1 -1
- package/dist/turns/resolve.js +19 -17
- package/dist/turns/resolve.js.map +1 -1
- package/dist/turns/retry-turn.d.ts +4 -0
- package/dist/turns/retry-turn.d.ts.map +1 -0
- package/dist/turns/retry-turn.js +20 -0
- package/dist/turns/retry-turn.js.map +1 -0
- package/dist/turns/run-calls.d.ts +21 -4
- package/dist/turns/run-calls.d.ts.map +1 -1
- package/dist/turns/run-calls.js +157 -41
- package/dist/turns/run-calls.js.map +1 -1
- package/dist/turns/run-command.d.ts +5 -3
- package/dist/turns/run-command.d.ts.map +1 -1
- package/dist/turns/run-command.js +21 -12
- package/dist/turns/run-command.js.map +1 -1
- package/dist/turns/settle-calls.d.ts +2 -8
- package/dist/turns/settle-calls.d.ts.map +1 -1
- package/dist/turns/settle-calls.js +26 -35
- package/dist/turns/settle-calls.js.map +1 -1
- package/dist/turns/start-turn.d.ts +8 -83
- package/dist/turns/start-turn.d.ts.map +1 -1
- package/dist/turns/start-turn.js +35 -24
- package/dist/turns/start-turn.js.map +1 -1
- package/dist/turns/step-claim.d.ts +39 -0
- package/dist/turns/step-claim.d.ts.map +1 -0
- package/dist/turns/step-claim.js +72 -0
- package/dist/turns/step-claim.js.map +1 -0
- package/dist/turns/step-intents.d.ts +31 -0
- package/dist/turns/step-intents.d.ts.map +1 -0
- package/dist/turns/step-intents.js +101 -0
- package/dist/turns/step-intents.js.map +1 -0
- package/dist/turns/step-next.d.ts +17 -0
- package/dist/turns/step-next.d.ts.map +1 -0
- package/dist/turns/step-next.js +25 -0
- package/dist/turns/step-next.js.map +1 -0
- package/dist/turns/step.d.ts +1 -1
- package/dist/turns/step.d.ts.map +1 -1
- package/dist/turns/step.js +108 -88
- package/dist/turns/step.js.map +1 -1
- package/dist/turns/summary-facts.d.ts +25 -0
- package/dist/turns/summary-facts.d.ts.map +1 -0
- package/dist/turns/summary-facts.js +63 -0
- package/dist/turns/summary-facts.js.map +1 -0
- package/dist/turns/usage.d.ts +7 -0
- package/dist/turns/usage.d.ts.map +1 -0
- package/dist/turns/usage.js +18 -0
- package/dist/turns/usage.js.map +1 -0
- package/dist/ui/register-ui.js +3 -3
- package/dist/ui/register-ui.js.map +1 -1
- package/dist/web/components/approval.css +2 -0
- package/dist/web/components/approval.js +233 -0
- package/dist/web/components/call.css +1 -1
- package/dist/web/components/call.js +841 -131
- package/dist/web/components/connectors.css +1 -1
- package/dist/web/components/connectors.js +595 -592
- package/dist/web/components/conversation.css +1 -1
- package/dist/web/components/conversation.js +3341 -1418
- package/dist/web/components/mcp-sign-in.css +1 -1
- package/dist/web/components/model.css +1 -1
- package/dist/web/components/model.js +138 -134
- package/dist/web/components/question.css +1 -1
- package/dist/web/components/question.js +148 -78
- package/dist/web/components/sessions.css +1 -1
- package/docs/connectors.md +2 -2
- package/locales/ar.json +119 -12
- package/locales/en.json +119 -12
- package/package.json +6 -6
- package/dist/turns/cancel-turn.d.ts +0 -3
- package/dist/turns/cancel-turn.d.ts.map +0 -1
- package/dist/turns/cancel-turn.js +0 -31
- package/dist/turns/cancel-turn.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"receipt-job.d.ts","sourceRoot":"","sources":["../../src/turns/receipt-job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,GAAG,EAAY,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAU9D,6FAA6F;AAC7F,wBAAsB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuB5F"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { ProblemError } from '@kvman/sdk';
|
|
2
|
+
import { txRecords } from "../store/collections.js";
|
|
3
|
+
import { recoveryJobMatches } from "./recover-workspace.js";
|
|
4
|
+
import { boundRecoveryIntent, recoveryState } from "./recovery-state.js";
|
|
5
|
+
function receiptState(store, receipt) {
|
|
6
|
+
const state = recoveryState(store, receipt.sessionId);
|
|
7
|
+
return state?.turn.id === receipt.turnId && state.intent?.legacyJobId === null && boundRecoveryIntent(state) ? state : undefined;
|
|
8
|
+
}
|
|
9
|
+
/** Acknowledgment only: never recover, enqueue, cancel, notify or attach to a newer turn. */
|
|
10
|
+
export async function receiptJob(ctx, receipt) {
|
|
11
|
+
ctx.job.signal.throwIfAborted();
|
|
12
|
+
const state = await ctx.store.transaction(tx => {
|
|
13
|
+
ctx.job.signal.throwIfAborted();
|
|
14
|
+
return receiptState(txRecords(tx), receipt);
|
|
15
|
+
});
|
|
16
|
+
const jobId = state?.session.stepJobId;
|
|
17
|
+
if (state === undefined || jobId === null || jobId === undefined)
|
|
18
|
+
return null;
|
|
19
|
+
let job;
|
|
20
|
+
try {
|
|
21
|
+
job = await ctx.exec('kernel.jobs.get', { id: jobId });
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
ctx.job.signal.throwIfAborted();
|
|
25
|
+
if (error instanceof ProblemError && error.problem.code === 'NOT_FOUND')
|
|
26
|
+
return null;
|
|
27
|
+
throw error;
|
|
28
|
+
}
|
|
29
|
+
ctx.job.signal.throwIfAborted();
|
|
30
|
+
if (!recoveryJobMatches(state, job, ctx.job.workspace.id))
|
|
31
|
+
return null;
|
|
32
|
+
return ctx.store.transaction(tx => {
|
|
33
|
+
ctx.job.signal.throwIfAborted();
|
|
34
|
+
const current = receiptState(txRecords(tx), receipt);
|
|
35
|
+
if (current === undefined || current.session.stepIntentId !== state.session.stepIntentId || current.session.stepGeneration !== state.session.stepGeneration || current.session.stepJobId !== jobId)
|
|
36
|
+
return null;
|
|
37
|
+
return recoveryJobMatches(current, job, ctx.job.workspace.id) ? jobId : null;
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=receipt-job.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"receipt-job.js","sourceRoot":"","sources":["../../src/turns/receipt-job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsB,MAAM,YAAY,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzE,SAAS,YAAY,CAAC,KAAgB,EAAE,OAAyB;IAC/D,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACtD,OAAO,KAAK,EAAE,IAAI,CAAC,EAAE,KAAK,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACnI,CAAC;AAED,6FAA6F;AAC7F,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAQ,EAAE,OAAyB;IAClE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;QAC7C,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAChC,OAAO,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC;IACvC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC9E,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QAAC,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAAC,CAAC;IAC/D,OAAO,KAAK,EAAE,CAAC;QACb,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAChC,IAAI,KAAK,YAAY,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,IAAI,CAAC;QACrF,MAAM,KAAK,CAAC;IACd,CAAC;IACD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;IAChC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC;IACvE,OAAO,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;QAChC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QACrD,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,KAAK,KAAK,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,cAAc,KAAK,KAAK,CAAC,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,KAAK,KAAK;YAAE,OAAO,IAAI,CAAC;QAChN,OAAO,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { type Ctx, type Job } from '@kvman/sdk';
|
|
2
|
+
import { type RecoveryState } from './recovery-state.ts';
|
|
3
|
+
/** Exact immutable binding, not a bounded jobs.list result or evidence from schema defaults. */
|
|
4
|
+
export declare function recoveryJobMatches(state: RecoveryState, job: Job, workspaceId: string): boolean;
|
|
5
|
+
/** Inspection never claims. SQLite decisions revalidate the snapshot after metadata awaits. */
|
|
6
|
+
export declare function recoverSession(ctx: Ctx, sessionId: string, dispatch?: boolean): Promise<void>;
|
|
7
|
+
/** Positive authorized send/answer only. Stop/delete/injection/handlers never call this dispatcher. */
|
|
8
|
+
export declare function recoverWorkspace(ctx: Ctx, deferSessionId?: string): Promise<void>;
|
|
9
|
+
//# sourceMappingURL=recover-workspace.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recover-workspace.d.ts","sourceRoot":"","sources":["../../src/turns/recover-workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAG9D,OAAO,EAA0G,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIjK,gGAAgG;AAChG,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAU/F;AAeD,+FAA+F;AAC/F,wBAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhG;AAED,uGAAuG;AACvG,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvF"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { ProblemError } from '@kvman/sdk';
|
|
2
|
+
import { records, txRecords } from "../store/collections.js";
|
|
3
|
+
import { notifyEnded } from "./end-turn.js";
|
|
4
|
+
import { boundRecoveryIntent, interruptUncertain, preparedRecovery, recoveryJobId, recoveryState, retryPrepared } from "./recovery-state.js";
|
|
5
|
+
import { dispatchStep } from "./start-turn.js";
|
|
6
|
+
import { stepInputSchema } from "./step-claim.js";
|
|
7
|
+
/** Exact immutable binding, not a bounded jobs.list result or evidence from schema defaults. */
|
|
8
|
+
export function recoveryJobMatches(state, job, workspaceId) {
|
|
9
|
+
if (state.session.stepIntentId !== null && !boundRecoveryIntent(state))
|
|
10
|
+
return false;
|
|
11
|
+
const expectedId = recoveryJobId(state);
|
|
12
|
+
if (job.id !== expectedId || job.name !== 'kvcoder.turn.step' || job.workspaceId !== workspaceId || job.retries !== 0)
|
|
13
|
+
return false;
|
|
14
|
+
if (job.status === 'queued' ? job.attempts !== 0 || state.intent?.phase === 'claimed' : job.status !== 'running' || job.attempts !== 1)
|
|
15
|
+
return false;
|
|
16
|
+
const parsed = stepInputSchema.safeParse(job.input);
|
|
17
|
+
if (!parsed.success || parsed.data.sessionId !== state.session.id || parsed.data.turnId !== state.turn.id)
|
|
18
|
+
return false;
|
|
19
|
+
if (state.intent !== undefined && state.session.stepJobId !== state.intent.jobId)
|
|
20
|
+
return false;
|
|
21
|
+
if ('intentId' in parsed.data)
|
|
22
|
+
return state.intent !== undefined && state.intent.legacyJobId === null && parsed.data.intentId === state.intent.id && parsed.data.generation === state.intent.generation;
|
|
23
|
+
return state.session.stepIntentId === null || (state.intent?.phase === 'claimed' && state.intent.legacyJobId === job.id);
|
|
24
|
+
}
|
|
25
|
+
async function knownJob(ctx, id) {
|
|
26
|
+
if (id === null)
|
|
27
|
+
return undefined;
|
|
28
|
+
try {
|
|
29
|
+
const job = await ctx.exec('kernel.jobs.get', { id });
|
|
30
|
+
ctx.job.signal.throwIfAborted();
|
|
31
|
+
return job;
|
|
32
|
+
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
ctx.job.signal.throwIfAborted();
|
|
35
|
+
if (error instanceof ProblemError && error.problem.code === 'NOT_FOUND')
|
|
36
|
+
return undefined;
|
|
37
|
+
throw error;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
/** Inspection never claims. SQLite decisions revalidate the snapshot after metadata awaits. */
|
|
41
|
+
export async function recoverSession(ctx, sessionId, dispatch = true) {
|
|
42
|
+
ctx.job.signal.throwIfAborted();
|
|
43
|
+
const state = await ctx.store.transaction(tx => {
|
|
44
|
+
ctx.job.signal.throwIfAborted();
|
|
45
|
+
return recoveryState(txRecords(tx), sessionId);
|
|
46
|
+
});
|
|
47
|
+
if (state === undefined)
|
|
48
|
+
return;
|
|
49
|
+
const job = await knownJob(ctx, recoveryJobId(state));
|
|
50
|
+
if (job !== undefined && recoveryJobMatches(state, job, ctx.job.workspace.id))
|
|
51
|
+
return;
|
|
52
|
+
const result = await ctx.store.transaction(tx => {
|
|
53
|
+
ctx.job.signal.throwIfAborted();
|
|
54
|
+
const store = txRecords(tx);
|
|
55
|
+
if (preparedRecovery(state))
|
|
56
|
+
return { step: retryPrepared(store, state) };
|
|
57
|
+
return { ended: interruptUncertain(store, state, job?.problem?.code ?? 'STEP_EFFECTS_UNKNOWN') };
|
|
58
|
+
});
|
|
59
|
+
if ('step' in result && result.step !== undefined && dispatch)
|
|
60
|
+
await dispatchStep(ctx, result.step, false);
|
|
61
|
+
if ('ended' in result && result.ended !== undefined)
|
|
62
|
+
await notifyEnded(ctx, result.ended);
|
|
63
|
+
}
|
|
64
|
+
/** Positive authorized send/answer only. Stop/delete/injection/handlers never call this dispatcher. */
|
|
65
|
+
export async function recoverWorkspace(ctx, deferSessionId) {
|
|
66
|
+
let after;
|
|
67
|
+
for (;;) {
|
|
68
|
+
ctx.job.signal.throwIfAborted();
|
|
69
|
+
const page = await records(ctx.store).sessions.find({}, { limit: 1000, ...(after === undefined ? {} : { after }) });
|
|
70
|
+
for (const session of page) {
|
|
71
|
+
if (session.status === 'running')
|
|
72
|
+
await recoverSession(ctx, session.id, session.id !== deferSessionId);
|
|
73
|
+
}
|
|
74
|
+
if (page.length < 1000)
|
|
75
|
+
return;
|
|
76
|
+
after = page[page.length - 1]?.id;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=recover-workspace.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recover-workspace.js","sourceRoot":"","sources":["../../src/turns/recover-workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { Stored } from '@kvman/sdk';
|
|
2
|
+
import type { SessionDoc, StepIntentDoc, TurnDoc } from '../schemas/records.ts';
|
|
3
|
+
import type { TxRecords } from '../store/collections.ts';
|
|
4
|
+
import { type StepIdentity } from './step-intents.ts';
|
|
5
|
+
export type RecoveryState = {
|
|
6
|
+
session: Stored<SessionDoc>;
|
|
7
|
+
turn: Stored<TurnDoc>;
|
|
8
|
+
intent: Stored<StepIntentDoc> | undefined;
|
|
9
|
+
};
|
|
10
|
+
/** An open runnable turn remains a candidate even when its stored ownership cannot be proved. */
|
|
11
|
+
export declare function recoveryState(store: TxRecords, sessionId: string): RecoveryState | undefined;
|
|
12
|
+
export declare function boundRecoveryIntent(state: RecoveryState): boolean;
|
|
13
|
+
export declare function preparedRecovery(state: RecoveryState): boolean;
|
|
14
|
+
export declare function recoveryJobId(state: RecoveryState): string | null;
|
|
15
|
+
/** Only modern prepared work has durable proof of no claimed effects. Never cancel an unverified job. */
|
|
16
|
+
export declare function retryPrepared(store: TxRecords, expected: RecoveryState): StepIdentity | undefined;
|
|
17
|
+
/** Retain uncertain bindings and end interrupted atomically, without effects or replay. */
|
|
18
|
+
export declare function interruptUncertain(store: TxRecords, expected: RecoveryState, code: string): import("./end-turn-state.ts").EndedTurn | undefined;
|
|
19
|
+
//# sourceMappingURL=recovery-state.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recovery-state.d.ts","sourceRoot":"","sources":["../../src/turns/recovery-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEpE,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,GAAG,SAAS,CAAA;CAAE,CAAC;AAE9H,iGAAiG;AACjG,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAM5F;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAGjE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAE9D;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI,CAGjE;AAUD,yGAAyG;AACzG,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,GAAG,YAAY,GAAG,SAAS,CAOjG;AA6BD,2FAA2F;AAC3F,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,uDAOzF"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { invalid } from "../problems.js";
|
|
2
|
+
import { now } from "../sessions/session-lookup.js";
|
|
3
|
+
import { endTurnState } from "./end-turn-state.js";
|
|
4
|
+
import { preparedStep } from "./step-intents.js";
|
|
5
|
+
/** An open runnable turn remains a candidate even when its stored ownership cannot be proved. */
|
|
6
|
+
export function recoveryState(store, sessionId) {
|
|
7
|
+
const session = store.sessions.get(sessionId);
|
|
8
|
+
if (session?.status !== 'running' || session.turnId === null)
|
|
9
|
+
return undefined;
|
|
10
|
+
const turn = store.turns.get(session.turnId);
|
|
11
|
+
if (turn?.sessionId !== sessionId || turn.outcome !== null || turn.endedAt !== null || turn.pending.length > 0)
|
|
12
|
+
return undefined;
|
|
13
|
+
return { session, turn, intent: session.stepIntentId === null ? undefined : store.stepIntents.get(session.stepIntentId) };
|
|
14
|
+
}
|
|
15
|
+
export function boundRecoveryIntent(state) {
|
|
16
|
+
const { intent, session, turn } = state;
|
|
17
|
+
return intent !== undefined && intent.id === session.stepIntentId && intent.sessionId === session.id && intent.turnId === turn.id && intent.generation === session.stepGeneration && (intent.phase === 'prepared' || intent.phase === 'claimed') && session.stepJobId === intent.jobId && (intent.phase !== 'claimed' || intent.jobId !== null);
|
|
18
|
+
}
|
|
19
|
+
export function preparedRecovery(state) {
|
|
20
|
+
return boundRecoveryIntent(state) && state.intent?.phase === 'prepared' && state.intent.legacyJobId === null;
|
|
21
|
+
}
|
|
22
|
+
export function recoveryJobId(state) {
|
|
23
|
+
const { intent, session, turn } = state;
|
|
24
|
+
return intent?.sessionId === session.id && intent.turnId === turn.id ? intent.jobId ?? intent.legacyJobId ?? session.stepJobId : session.stepJobId;
|
|
25
|
+
}
|
|
26
|
+
/** Metadata was awaited outside SQLite. Recheck every ownership field before using that observation. */
|
|
27
|
+
function unchanged(store, expected) {
|
|
28
|
+
const current = recoveryState(store, expected.session.id);
|
|
29
|
+
if (current === undefined || current.turn.id !== expected.turn.id || current.session.stepGeneration !== expected.session.stepGeneration || current.session.stepIntentId !== expected.session.stepIntentId || current.session.stepJobId !== expected.session.stepJobId)
|
|
30
|
+
return undefined;
|
|
31
|
+
if (current.intent?.id !== expected.intent?.id || current.intent?.sessionId !== expected.intent?.sessionId || current.intent?.turnId !== expected.intent?.turnId || current.intent?.generation !== expected.intent?.generation || current.intent?.phase !== expected.intent?.phase || current.intent?.jobId !== expected.intent?.jobId || current.intent?.legacyJobId !== expected.intent?.legacyJobId)
|
|
32
|
+
return undefined;
|
|
33
|
+
return current;
|
|
34
|
+
}
|
|
35
|
+
/** Only modern prepared work has durable proof of no claimed effects. Never cancel an unverified job. */
|
|
36
|
+
export function retryPrepared(store, expected) {
|
|
37
|
+
const current = unchanged(store, expected);
|
|
38
|
+
if (current === undefined || !preparedRecovery(current) || current.intent === undefined)
|
|
39
|
+
return undefined;
|
|
40
|
+
const updatedAt = now();
|
|
41
|
+
store.stepIntents.update(current.intent.id, { jobId: null, updatedAt });
|
|
42
|
+
store.sessions.update(current.session.id, { stepJobId: null, updatedAt });
|
|
43
|
+
return preparedStep(store, current.session.id, current.turn.id);
|
|
44
|
+
}
|
|
45
|
+
/** Retain ALL owned unsettled references for this turn; a foreign pointer is never write authority. */
|
|
46
|
+
function retainUncertain(store, current) {
|
|
47
|
+
const { session, turn } = current;
|
|
48
|
+
let after, hasTracking = false, savedTracked = session.stepJobId === null;
|
|
49
|
+
for (;;) {
|
|
50
|
+
const page = store.stepIntents.find({ sessionId: session.id, turnId: turn.id }, { limit: 1000, ...(after === undefined ? {} : { after }) });
|
|
51
|
+
for (const intent of page) {
|
|
52
|
+
if (intent.phase !== 'prepared' && intent.phase !== 'claimed')
|
|
53
|
+
continue;
|
|
54
|
+
hasTracking = true;
|
|
55
|
+
if (intent.jobId === session.stepJobId || intent.legacyJobId === session.stepJobId)
|
|
56
|
+
savedTracked = true;
|
|
57
|
+
store.stepIntents.update(intent.id, { phase: 'needs-review', reason: 'STEP_EFFECTS_UNKNOWN', updatedAt: now() });
|
|
58
|
+
}
|
|
59
|
+
if (page.length < 1000)
|
|
60
|
+
break;
|
|
61
|
+
after = page[page.length - 1]?.id;
|
|
62
|
+
}
|
|
63
|
+
if (hasTracking && savedTracked)
|
|
64
|
+
return;
|
|
65
|
+
// Diagnostics never acquire executable authority, including under deleting or broken ancestry.
|
|
66
|
+
// Legacy saved references retain their legacy slot; unprovable modern candidates are not fabricated claims.
|
|
67
|
+
const legacy = session.stepIntentId === null, generation = session.stepGeneration + 1;
|
|
68
|
+
if (!Number.isSafeInteger(generation))
|
|
69
|
+
throw invalid('The next step generation exceeds the safe integer range.');
|
|
70
|
+
const stamp = now();
|
|
71
|
+
const intent = store.stepIntents.insert({ sessionId: session.id, turnId: turn.id, generation,
|
|
72
|
+
phase: 'needs-review', jobId: legacy ? null : session.stepJobId, legacyJobId: legacy ? session.stepJobId : null,
|
|
73
|
+
reason: 'STEP_EFFECTS_UNKNOWN', createdAt: stamp, updatedAt: stamp });
|
|
74
|
+
store.sessions.update(session.id, { stepGeneration: generation, stepIntentId: intent.id, stepJobId: null, updatedAt: stamp });
|
|
75
|
+
}
|
|
76
|
+
/** Retain uncertain bindings and end interrupted atomically, without effects or replay. */
|
|
77
|
+
export function interruptUncertain(store, expected, code) {
|
|
78
|
+
const current = unchanged(store, expected);
|
|
79
|
+
if (current === undefined)
|
|
80
|
+
return undefined;
|
|
81
|
+
retainUncertain(store, current);
|
|
82
|
+
const ended = endTurnState(store, current.session.id, current.turn.id, 'interrupted', 'handler', { code: 'INTERRUPTED', params: { code } });
|
|
83
|
+
if (ended === undefined)
|
|
84
|
+
throw invalid('The uncertain step must end in its current turn transaction.');
|
|
85
|
+
return ended;
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=recovery-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recovery-state.js","sourceRoot":"","sources":["../../src/turns/recovery-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-interruptions.d.ts","sourceRoot":"","sources":["../../src/turns/register-interruptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"register-interruptions.d.ts","sourceRoot":"","sources":["../../src/turns/register-interruptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAuBtC,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAcpD"}
|
|
@@ -1,14 +1,25 @@
|
|
|
1
1
|
import { runLost } from "../delegate/register-worker-run.js";
|
|
2
|
-
import { records } from "../store/collections.js";
|
|
3
|
-
import {
|
|
2
|
+
import { records, txRecords } from "../store/collections.js";
|
|
3
|
+
import { notifyEnded } from "./end-turn.js";
|
|
4
|
+
import { interruptUncertain, preparedRecovery, recoveryState } from "./recovery-state.js";
|
|
4
5
|
// Steps that end without finishing (plan 08 §8.1, ADR 0009, 95): a step cut off by a stop, a crash, or a timeout ends
|
|
5
6
|
// its turn with a notice. These handlers queue nothing, since their jobs carry the `fromHandler` mark.
|
|
6
|
-
async function stepEnded(ctx, jobId,
|
|
7
|
+
async function stepEnded(ctx, jobId, code) {
|
|
7
8
|
const [session] = await records(ctx.store).sessions.find({ stepJobId: jobId }, { limit: 1 });
|
|
8
|
-
if (session === undefined
|
|
9
|
+
if (session === undefined)
|
|
9
10
|
return;
|
|
10
|
-
const
|
|
11
|
-
|
|
11
|
+
const ended = await ctx.store.transaction(tx => {
|
|
12
|
+
ctx.job.signal.throwIfAborted();
|
|
13
|
+
const store = txRecords(tx), state = recoveryState(store, session.id);
|
|
14
|
+
if (state?.session.stepJobId !== jobId)
|
|
15
|
+
return undefined;
|
|
16
|
+
// A modern prepared job never claimed effects. Keep its recoverable intent instead of ending it.
|
|
17
|
+
if (preparedRecovery(state))
|
|
18
|
+
return undefined;
|
|
19
|
+
return interruptUncertain(store, state, code);
|
|
20
|
+
});
|
|
21
|
+
if (ended !== undefined)
|
|
22
|
+
await notifyEnded(ctx, ended);
|
|
12
23
|
}
|
|
13
24
|
export function registerInterruptions(ctx) {
|
|
14
25
|
ctx.registerHandler('kernel.job.failed', {
|
|
@@ -17,14 +28,14 @@ export function registerInterruptions(ctx) {
|
|
|
17
28
|
if (name === 'kvcoder.delegate.worker.run')
|
|
18
29
|
await runLost(ctx, jobId, problem.code);
|
|
19
30
|
if (name === 'kvcoder.turn.step')
|
|
20
|
-
await stepEnded(ctx, jobId, problem.code
|
|
31
|
+
await stepEnded(ctx, jobId, problem.code);
|
|
21
32
|
},
|
|
22
33
|
});
|
|
23
34
|
ctx.registerHandler('kernel.job.cancelled', {
|
|
24
35
|
description: 'Ends the turn of a cancelled step.',
|
|
25
36
|
handle: async ({ jobId, name }) => {
|
|
26
37
|
if (name === 'kvcoder.turn.step')
|
|
27
|
-
await stepEnded(ctx, jobId, '
|
|
38
|
+
await stepEnded(ctx, jobId, 'CANCELLED');
|
|
28
39
|
},
|
|
29
40
|
});
|
|
30
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-interruptions.js","sourceRoot":"","sources":["../../src/turns/register-interruptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"register-interruptions.js","sourceRoot":"","sources":["../../src/turns/register-interruptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE1F,sHAAsH;AACtH,uGAAuG;AAEvG,KAAK,UAAU,SAAS,CAAC,GAAQ,EAAE,KAAa,EAAE,IAAY;IAC5D,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IAC7F,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO;IAClC,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;QAC7C,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACtE,IAAI,KAAK,EAAE,OAAO,CAAC,SAAS,KAAK,KAAK;YAAE,OAAO,SAAS,CAAC;QACzD,iGAAiG;QACjG,IAAI,gBAAgB,CAAC,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC9C,OAAO,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,IAAI,KAAK,KAAK,SAAS;QAAE,MAAM,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAQ;IAC5C,GAAG,CAAC,eAAe,CAAC,mBAAmB,EAAE;QACvC,WAAW,EAAE,kFAAkF;QAC/F,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;YACzC,IAAI,IAAI,KAAK,6BAA6B;gBAAE,MAAM,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACpF,IAAI,IAAI,KAAK,mBAAmB;gBAAE,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9E,CAAC;KACF,CAAC,CAAC;IACH,GAAG,CAAC,eAAe,CAAC,sBAAsB,EAAE;QAC1C,WAAW,EAAE,oCAAoC;QACjD,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YAChC,IAAI,IAAI,KAAK,mBAAmB;gBAAE,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QAC7E,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-turns.d.ts","sourceRoot":"","sources":["../../src/turns/register-turns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"register-turns.d.ts","sourceRoot":"","sources":["../../src/turns/register-turns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAczC,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CA8D5C"}
|
|
@@ -1,22 +1,36 @@
|
|
|
1
1
|
import { z } from '@kvman/sdk';
|
|
2
|
-
import {
|
|
3
|
-
import { checkedAnswer } from "../connectors/ask.js";
|
|
4
|
-
import { runCallSchema } from "../schemas/records.js";
|
|
2
|
+
import { startApprovedRun } from "../delegate/approved-run.js";
|
|
5
3
|
import { findSession, ownSession, userOnly } from "../sessions/session-lookup.js";
|
|
6
4
|
import { turnSchema, turnView } from "../sessions/session-view.js";
|
|
7
5
|
import { records, txRecords } from "../store/collections.js";
|
|
8
|
-
import { cancelTurn } from "./
|
|
9
|
-
import {
|
|
10
|
-
|
|
6
|
+
import { cancelTurn } from "./end-turn.js";
|
|
7
|
+
import { applyAnswer } from "./apply-answer.js";
|
|
8
|
+
import { receiptJob } from "./receipt-job.js";
|
|
9
|
+
import { recoverWorkspace } from "./recover-workspace.js";
|
|
10
|
+
import { retryTurn } from "./retry-turn.js";
|
|
11
|
+
import { dispatchStep } from "./start-turn.js";
|
|
12
|
+
// Turns (plan 08 §8.6): retry, cancel, list, and the person's answer to a question or approval.
|
|
11
13
|
export function registerTurns(ctx) {
|
|
12
|
-
ctx.registerCommand('kvcoder.turn.
|
|
13
|
-
description: "
|
|
14
|
+
ctx.registerCommand('kvcoder.turn.retry', {
|
|
15
|
+
description: "Runs a stopped turn again on the session's history, without adding a message.",
|
|
14
16
|
input: z.object({ sessionId: z.string() }),
|
|
15
17
|
output: z.object({}),
|
|
16
18
|
public: true,
|
|
19
|
+
retries: 0,
|
|
17
20
|
handle: async ({ sessionId }) => {
|
|
21
|
+
userOnly(ctx, 'kvcoder.turn.retry');
|
|
22
|
+
await retryTurn(ctx, await ownSession(ctx, sessionId));
|
|
23
|
+
return {};
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
ctx.registerCommand('kvcoder.turn.cancel', {
|
|
27
|
+
description: "Cancels a session's turn: its step, its subagents' turns, and its questions. With turnId, only when that turn is still the current one.",
|
|
28
|
+
input: z.object({ sessionId: z.string(), turnId: z.string().exactOptional() }),
|
|
29
|
+
output: z.object({}),
|
|
30
|
+
public: true,
|
|
31
|
+
handle: async ({ sessionId, turnId }) => {
|
|
18
32
|
await ownSession(ctx, sessionId);
|
|
19
|
-
await cancelTurn(ctx, sessionId, true);
|
|
33
|
+
await cancelTurn(ctx, sessionId, true, turnId);
|
|
20
34
|
return {};
|
|
21
35
|
},
|
|
22
36
|
});
|
|
@@ -38,28 +52,25 @@ export function registerTurns(ctx) {
|
|
|
38
52
|
retries: 0,
|
|
39
53
|
handle: async ({ questionId, answer }) => {
|
|
40
54
|
userOnly(ctx, 'kvcoder.question.answer');
|
|
41
|
-
|
|
42
|
-
if (
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
return
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (
|
|
56
|
-
return { jobId: await
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
? { toolCallId: question.toolCallId, text: '', details: null, isError: false, run: runCallSchema.parse(question.question) }
|
|
61
|
-
: heldText(question.toolCallId, 'denied by the user', true);
|
|
62
|
-
return { jobId: await resolvePending(ctx, question.sessionId, question.toolCallId, held, false) };
|
|
55
|
+
let result = await ctx.store.transaction(tx => applyAnswer(ctx, txRecords(tx), questionId, answer));
|
|
56
|
+
if (result.kind === 'delegate') {
|
|
57
|
+
// Legacy positive launch has no receipt: recover first, then retain exact approval identity through preparation.
|
|
58
|
+
await recoverWorkspace(ctx);
|
|
59
|
+
const expected = result.question;
|
|
60
|
+
result = await ctx.store.transaction(tx => {
|
|
61
|
+
const store = txRecords(tx), current = applyAnswer(ctx, store, questionId, answer, expected);
|
|
62
|
+
return current;
|
|
63
|
+
});
|
|
64
|
+
if (result.kind === 'delegate') {
|
|
65
|
+
ctx.job.signal.throwIfAborted();
|
|
66
|
+
return { jobId: await startApprovedRun(ctx, { question: result.question, call: result.call }) };
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (result.kind === 'acknowledged')
|
|
70
|
+
return { jobId: await receiptJob(ctx, result.receipt) };
|
|
71
|
+
// Only a newly committed application authorizes recovery; racing receipt acknowledgments never enter it.
|
|
72
|
+
await recoverWorkspace(ctx, result.receipt.sessionId);
|
|
73
|
+
return { jobId: result.identity === null ? null : await dispatchStep(ctx, result.identity, false) };
|
|
63
74
|
},
|
|
64
75
|
});
|
|
65
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-turns.js","sourceRoot":"","sources":["../../src/turns/register-turns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAY,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"register-turns.js","sourceRoot":"","sources":["../../src/turns/register-turns.ts"],"names":[],"mappings":"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"}
|
package/dist/turns/resolve.d.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import type { Ctx } from '@kvman/sdk';
|
|
2
2
|
import type { HeldResult } from '../schemas/records.ts';
|
|
3
|
+
import { type TxRecords } from '../store/collections.ts';
|
|
4
|
+
import { type StepIdentity } from './step-intents.ts';
|
|
5
|
+
/** Synchronous transition for callers that must commit additional records with this held result. */
|
|
6
|
+
export declare function resolvePendingInTx(store: TxRecords, sessionId: string, toolCallId: string, held: HeldResult): StepIdentity | null;
|
|
3
7
|
/** Holds a result for a pending call; resolves to the next step's job id when it was the last, else `null`. */
|
|
4
8
|
export declare function resolvePending(ctx: Ctx, sessionId: string, toolCallId: string, held: HeldResult, follow: boolean): Promise<string | null>;
|
|
5
9
|
/** A result that is plain text. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/turns/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/turns/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpE,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKnE,oGAAoG;AACpG,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CAUjI;AAED,+GAA+G;AAC/G,wBAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAG/I;AAED,mCAAmC;AACnC,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,CAEvF"}
|
package/dist/turns/resolve.js
CHANGED
|
@@ -1,26 +1,28 @@
|
|
|
1
1
|
import { now } from "../sessions/session-lookup.js";
|
|
2
2
|
import { txRecords } from "../store/collections.js";
|
|
3
|
-
import {
|
|
3
|
+
import { dispatchStep } from "./start-turn.js";
|
|
4
|
+
import { prepareStep } from "./step-intents.js";
|
|
4
5
|
// Resolving a pending call (plan 08 §8.1): its result is held in the turn; when the last one resolves, the session runs
|
|
5
6
|
// again and the next step appends every result in the model's call order before it calls the model.
|
|
7
|
+
/** Synchronous transition for callers that must commit additional records with this held result. */
|
|
8
|
+
export function resolvePendingInTx(store, sessionId, toolCallId, held) {
|
|
9
|
+
const session = store.sessions.get(sessionId);
|
|
10
|
+
if (session === undefined || session.turnId === null)
|
|
11
|
+
return null;
|
|
12
|
+
const turn = store.turns.get(session.turnId);
|
|
13
|
+
if (session.status !== 'waiting' || turn?.sessionId !== sessionId || turn.outcome !== null || turn.endedAt !== null || !turn.pending.some(item => item.toolCallId === toolCallId))
|
|
14
|
+
return null;
|
|
15
|
+
const pending = turn.pending.filter(item => item.toolCallId !== toolCallId);
|
|
16
|
+
store.turns.update(turn.id, { pending, results: [...turn.results, held] });
|
|
17
|
+
if (pending.length > 0)
|
|
18
|
+
return null;
|
|
19
|
+
store.sessions.update(sessionId, { status: 'running', updatedAt: now() });
|
|
20
|
+
return prepareStep(store, sessionId, turn.id);
|
|
21
|
+
}
|
|
6
22
|
/** Holds a result for a pending call; resolves to the next step's job id when it was the last, else `null`. */
|
|
7
23
|
export async function resolvePending(ctx, sessionId, toolCallId, held, follow) {
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
const session = store.sessions.get(sessionId);
|
|
11
|
-
if (session === undefined || session.turnId === null)
|
|
12
|
-
return null;
|
|
13
|
-
const turn = store.turns.get(session.turnId);
|
|
14
|
-
if (turn === undefined || !turn.pending.some((item) => item.toolCallId === toolCallId))
|
|
15
|
-
return null;
|
|
16
|
-
const pending = turn.pending.filter((item) => item.toolCallId !== toolCallId);
|
|
17
|
-
store.turns.update(turn.id, { pending, results: [...turn.results, held] });
|
|
18
|
-
if (pending.length > 0)
|
|
19
|
-
return null;
|
|
20
|
-
store.sessions.update(sessionId, { status: 'running', updatedAt: now() });
|
|
21
|
-
return turn.id;
|
|
22
|
-
});
|
|
23
|
-
return turnId === null ? null : queueStep(ctx, sessionId, turnId, follow);
|
|
24
|
+
const identity = await ctx.store.transaction(tx => resolvePendingInTx(txRecords(tx), sessionId, toolCallId, held));
|
|
25
|
+
return identity === null ? null : dispatchStep(ctx, identity, follow);
|
|
24
26
|
}
|
|
25
27
|
/** A result that is plain text. */
|
|
26
28
|
export function heldText(toolCallId, text, isError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/turns/resolve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACpD,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/turns/resolve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAqB,MAAM,mBAAmB,CAAC;AAEnE,wHAAwH;AACxH,oGAAoG;AAEpG,oGAAoG;AACpG,MAAM,UAAU,kBAAkB,CAAC,KAAgB,EAAE,SAAiB,EAAE,UAAkB,EAAE,IAAgB;IAC1G,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,EAAE,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/L,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;IAC5E,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAC1E,OAAO,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;AAChD,CAAC;AAED,+GAA+G;AAC/G,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAQ,EAAE,SAAiB,EAAE,UAAkB,EAAE,IAAgB,EAAE,MAAe;IACrH,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;IACnH,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACxE,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,QAAQ,CAAC,UAAkB,EAAE,IAAY,EAAE,OAAgB;IACzE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;AACjE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retry-turn.d.ts","sourceRoot":"","sources":["../../src/turns/retry-turn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASxD,wBAAsB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpF"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { invalid } from "../problems.js";
|
|
2
|
+
import { txRecords } from "../store/collections.js";
|
|
3
|
+
import { beginTurn, openTurn } from "./start-turn.js";
|
|
4
|
+
// Retry (ADR 0050, 3): a turn that stopped runs again on the session's history as it stands. No message is added, so
|
|
5
|
+
// the chat and the model's context stay as the person left them.
|
|
6
|
+
const stopped = new Set(['STEP_FAILED', 'REPLY_LOST', 'REPLY_INCOMPLETE', 'INTERRUPTED']);
|
|
7
|
+
export async function retryTurn(ctx, session) {
|
|
8
|
+
const turnId = await ctx.store.transaction((tx) => {
|
|
9
|
+
const store = txRecords(tx);
|
|
10
|
+
const fresh = store.sessions.get(session.id);
|
|
11
|
+
if (fresh === undefined)
|
|
12
|
+
throw ctx.problem('kvcoder/SESSION_NOT_FOUND', { sessionId: session.id });
|
|
13
|
+
const [last] = store.messages.find({ sessionId: session.id }, { limit: 1, order: 'desc' });
|
|
14
|
+
if (fresh.status !== 'idle' || last?.kind !== 'notice' || !stopped.has(String(last.content['code'])))
|
|
15
|
+
throw invalid("Only a chat whose last turn stopped can be retried.", { sessionId: session.id });
|
|
16
|
+
return openTurn(store, fresh);
|
|
17
|
+
});
|
|
18
|
+
await beginTurn(ctx, session.id, turnId, true);
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=retry-turn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retry-turn.js","sourceRoot":"","sources":["../../src/turns/retry-turn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qHAAqH;AACrH,iEAAiE;AAEjE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC;AAE1F,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAQ,EAAE,OAA2B;IACnE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE;QAChD,MAAM,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAI,KAAK,KAAK,SAAS;YAAE,MAAM,GAAG,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACnG,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3F,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,EAAE,IAAI,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAAE,MAAM,OAAO,CAAC,qDAAqD,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtM,OAAO,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC"}
|