@superblocksteam/vite-plugin-file-sync 2.0.130-next.2 → 2.0.130-next.4
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/ai-service/agent/prompts/build-base-system-prompt.js +1 -1
- package/dist/ai-service/agent/prompts/build-base-system-prompt.js.map +1 -1
- package/dist/ai-service/agent/subagents/coding/run-coding-subagent.d.ts +1 -0
- package/dist/ai-service/agent/subagents/coding/run-coding-subagent.d.ts.map +1 -1
- package/dist/ai-service/agent/subagents/coding/run-coding-subagent.js +2 -1
- package/dist/ai-service/agent/subagents/coding/run-coding-subagent.js.map +1 -1
- package/dist/ai-service/agent/tools/apis/api-validation-orchestrator.d.ts.map +1 -1
- package/dist/ai-service/agent/tools/apis/api-validation-orchestrator.js +8 -4
- package/dist/ai-service/agent/tools/apis/api-validation-orchestrator.js.map +1 -1
- package/dist/ai-service/agent/tools/build-capture-screenshot.d.ts +3 -0
- package/dist/ai-service/agent/tools/build-capture-screenshot.d.ts.map +1 -1
- package/dist/ai-service/agent/tools/build-capture-screenshot.js +18 -3
- package/dist/ai-service/agent/tools/build-capture-screenshot.js.map +1 -1
- package/dist/ai-service/agent/tools/build-navigate-preview.d.ts.map +1 -1
- package/dist/ai-service/agent/tools/build-navigate-preview.js +3 -2
- package/dist/ai-service/agent/tools/build-navigate-preview.js.map +1 -1
- package/dist/ai-service/agent/tools/build-reload-file.d.ts.map +1 -1
- package/dist/ai-service/agent/tools/build-reload-file.js +4 -1
- package/dist/ai-service/agent/tools/build-reload-file.js.map +1 -1
- package/dist/ai-service/agent/tools/integrations/delete-integration.d.ts.map +1 -1
- package/dist/ai-service/agent/tools/integrations/delete-integration.js +8 -3
- package/dist/ai-service/agent/tools/integrations/delete-integration.js.map +1 -1
- package/dist/ai-service/agent/tools/integrations/integration-setup.d.ts.map +1 -1
- package/dist/ai-service/agent/tools/integrations/integration-setup.js +26 -14
- package/dist/ai-service/agent/tools/integrations/integration-setup.js.map +1 -1
- package/dist/ai-service/agent/tools/integrations/internal.d.ts.map +1 -1
- package/dist/ai-service/agent/tools/integrations/internal.js +9 -2
- package/dist/ai-service/agent/tools/integrations/internal.js.map +1 -1
- package/dist/ai-service/agent/tools.d.ts.map +1 -1
- package/dist/ai-service/agent/tools.js +12 -9
- package/dist/ai-service/agent/tools.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/ask-multi-choice.d.ts +8 -0
- package/dist/ai-service/agent/tools2/tools/ask-multi-choice.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/ask-multi-choice.js +7 -5
- package/dist/ai-service/agent/tools2/tools/ask-multi-choice.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/ask-searchable-dropdown.d.ts +8 -0
- package/dist/ai-service/agent/tools2/tools/ask-searchable-dropdown.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/ask-searchable-dropdown.js +7 -0
- package/dist/ai-service/agent/tools2/tools/ask-searchable-dropdown.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/bash.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/bash.js +21 -1
- package/dist/ai-service/agent/tools2/tools/bash.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/deploy-service.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/deploy-service.js +43 -11
- package/dist/ai-service/agent/tools2/tools/deploy-service.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/exit-plan-mode.d.ts +14 -2
- package/dist/ai-service/agent/tools2/tools/exit-plan-mode.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/exit-plan-mode.js +67 -40
- package/dist/ai-service/agent/tools2/tools/exit-plan-mode.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/git.d.ts +8 -5
- package/dist/ai-service/agent/tools2/tools/git.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/git.js +36 -7
- package/dist/ai-service/agent/tools2/tools/git.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/spawn-coding-subagents.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/spawn-coding-subagents.js +7 -1
- package/dist/ai-service/agent/tools2/tools/spawn-coding-subagents.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/start-test-run.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/start-test-run.js +4 -1
- package/dist/ai-service/agent/tools2/tools/start-test-run.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/tool-timeout.d.ts +2 -0
- package/dist/ai-service/agent/tools2/tools/tool-timeout.d.ts.map +1 -0
- package/dist/ai-service/agent/tools2/tools/tool-timeout.js +2 -0
- package/dist/ai-service/agent/tools2/tools/tool-timeout.js.map +1 -0
- package/dist/ai-service/agent/tools2/tools/wait-for-task.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/wait-for-task.js +14 -4
- package/dist/ai-service/agent/tools2/tools/wait-for-task.js.map +1 -1
- package/dist/ai-service/agent/tools2/types.d.ts +3 -0
- package/dist/ai-service/agent/tools2/types.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/types.js.map +1 -1
- package/dist/ai-service/app-interface/shell.d.ts +36 -0
- package/dist/ai-service/app-interface/shell.d.ts.map +1 -1
- package/dist/ai-service/app-interface/shell.js +169 -4
- package/dist/ai-service/app-interface/shell.js.map +1 -1
- package/dist/ai-service/app-skills/helpers.d.ts.map +1 -1
- package/dist/ai-service/app-skills/helpers.js +7 -3
- package/dist/ai-service/app-skills/helpers.js.map +1 -1
- package/dist/ai-service/attachments/csv-upload-artifacts.d.ts +35 -0
- package/dist/ai-service/attachments/csv-upload-artifacts.d.ts.map +1 -0
- package/dist/ai-service/attachments/csv-upload-artifacts.js +205 -0
- package/dist/ai-service/attachments/csv-upload-artifacts.js.map +1 -0
- package/dist/ai-service/context-download.d.ts.map +1 -1
- package/dist/ai-service/context-download.js +48 -1
- package/dist/ai-service/context-download.js.map +1 -1
- package/dist/ai-service/context-upload.d.ts.map +1 -1
- package/dist/ai-service/context-upload.js +10 -0
- package/dist/ai-service/context-upload.js.map +1 -1
- package/dist/ai-service/index.d.ts.map +1 -1
- package/dist/ai-service/index.js +6 -6
- package/dist/ai-service/index.js.map +1 -1
- package/dist/ai-service/llm/clark-stream-telemetry-sink.d.ts.map +1 -1
- package/dist/ai-service/llm/clark-stream-telemetry-sink.js +47 -0
- package/dist/ai-service/llm/clark-stream-telemetry-sink.js.map +1 -1
- package/dist/ai-service/llm/client.d.ts.map +1 -1
- package/dist/ai-service/llm/client.js +7 -6
- package/dist/ai-service/llm/client.js.map +1 -1
- package/dist/ai-service/llm/context-v2/context.d.ts +14 -0
- package/dist/ai-service/llm/context-v2/context.d.ts.map +1 -1
- package/dist/ai-service/llm/context-v2/context.js +51 -1
- package/dist/ai-service/llm/context-v2/context.js.map +1 -1
- package/dist/ai-service/llm/stream/errors.d.ts +8 -0
- package/dist/ai-service/llm/stream/errors.d.ts.map +1 -1
- package/dist/ai-service/llm/stream/errors.js +13 -0
- package/dist/ai-service/llm/stream/errors.js.map +1 -1
- package/dist/ai-service/llm/stream/idle-monitor.d.ts +21 -0
- package/dist/ai-service/llm/stream/idle-monitor.d.ts.map +1 -1
- package/dist/ai-service/llm/stream/idle-monitor.js +62 -0
- package/dist/ai-service/llm/stream/idle-monitor.js.map +1 -1
- package/dist/ai-service/llm/stream/managed-stream.d.ts.map +1 -1
- package/dist/ai-service/llm/stream/managed-stream.js +12 -2
- package/dist/ai-service/llm/stream/managed-stream.js.map +1 -1
- package/dist/ai-service/llm/stream/orchestrator.d.ts.map +1 -1
- package/dist/ai-service/llm/stream/orchestrator.js +252 -17
- package/dist/ai-service/llm/stream/orchestrator.js.map +1 -1
- package/dist/ai-service/llm/stream/retry-engine.d.ts +3 -2
- package/dist/ai-service/llm/stream/retry-engine.d.ts.map +1 -1
- package/dist/ai-service/llm/stream/retry-engine.js +21 -1
- package/dist/ai-service/llm/stream/retry-engine.js.map +1 -1
- package/dist/ai-service/llm/stream/session.d.ts +9 -2
- package/dist/ai-service/llm/stream/session.d.ts.map +1 -1
- package/dist/ai-service/llm/stream/session.js +29 -4
- package/dist/ai-service/llm/stream/session.js.map +1 -1
- package/dist/ai-service/llm/stream/types.d.ts +1 -0
- package/dist/ai-service/llm/stream/types.d.ts.map +1 -1
- package/dist/ai-service/state-machine/clark-fsm.d.ts.map +1 -1
- package/dist/ai-service/state-machine/clark-fsm.js +10 -1
- package/dist/ai-service/state-machine/clark-fsm.js.map +1 -1
- package/dist/ai-service/state-machine/handlers/awaiting-user.js +3 -3
- package/dist/ai-service/state-machine/handlers/awaiting-user.js.map +1 -1
- package/dist/ai-service/state-machine/handlers/llm-generating.d.ts +10 -1
- package/dist/ai-service/state-machine/handlers/llm-generating.d.ts.map +1 -1
- package/dist/ai-service/state-machine/handlers/llm-generating.js +203 -9
- package/dist/ai-service/state-machine/handlers/llm-generating.js.map +1 -1
- package/dist/ai-service/state-machine/helpers/change-info.d.ts +1 -1
- package/dist/ai-service/state-machine/helpers/change-info.d.ts.map +1 -1
- package/dist/ai-service/state-machine/helpers/peer.d.ts +6 -2
- package/dist/ai-service/state-machine/helpers/peer.d.ts.map +1 -1
- package/dist/ai-service/state-machine/helpers/peer.js +47 -11
- package/dist/ai-service/state-machine/helpers/peer.js.map +1 -1
- package/dist/ai-service/state-machine/helpers/stable-peer.d.ts +2 -0
- package/dist/ai-service/state-machine/helpers/stable-peer.d.ts.map +1 -1
- package/dist/ai-service/state-machine/helpers/stable-peer.js +24 -0
- package/dist/ai-service/state-machine/helpers/stable-peer.js.map +1 -1
- package/dist/ai-service/state-machine/mocks.d.ts.map +1 -1
- package/dist/ai-service/state-machine/mocks.js +4 -0
- package/dist/ai-service/state-machine/mocks.js.map +1 -1
- package/dist/ai-service/tasks/task-store.d.ts +1 -1
- package/dist/ai-service/tasks/task-store.d.ts.map +1 -1
- package/dist/ai-service/tasks/task-store.js +10 -1
- package/dist/ai-service/tasks/task-store.js.map +1 -1
- package/dist/ai-service/util/rpc-timeout.d.ts +11 -0
- package/dist/ai-service/util/rpc-timeout.d.ts.map +1 -1
- package/dist/ai-service/util/rpc-timeout.js +13 -0
- package/dist/ai-service/util/rpc-timeout.js.map +1 -1
- package/dist/file-system-helpers.d.ts +13 -0
- package/dist/file-system-helpers.d.ts.map +1 -1
- package/dist/file-system-helpers.js +22 -1
- package/dist/file-system-helpers.js.map +1 -1
- package/dist/sync-service/list-dir.d.ts +1 -1
- package/dist/sync-service/list-dir.js +3 -3
- package/dist/sync-service/list-dir.js.map +1 -1
- package/package.json +8 -8
|
@@ -22,7 +22,7 @@ function isFailedStatus(status) {
|
|
|
22
22
|
function isTimedOutStatus(status) {
|
|
23
23
|
return status === "TIMED_OUT" || status === "BUILD_STATUS_TIMED_OUT";
|
|
24
24
|
}
|
|
25
|
-
async function serverPost(superblocksBaseUrl, jwt, path, body) {
|
|
25
|
+
async function serverPost(superblocksBaseUrl, jwt, path, body, options = {}) {
|
|
26
26
|
const url = `${superblocksBaseUrl}/api/${path}`;
|
|
27
27
|
const response = await fetch(url, {
|
|
28
28
|
method: "POST",
|
|
@@ -31,6 +31,7 @@ async function serverPost(superblocksBaseUrl, jwt, path, body) {
|
|
|
31
31
|
"Content-Type": "application/json",
|
|
32
32
|
},
|
|
33
33
|
body: JSON.stringify(body),
|
|
34
|
+
signal: options.abortSignal,
|
|
34
35
|
});
|
|
35
36
|
if (!response.ok) {
|
|
36
37
|
const text = await response.text().catch(() => "");
|
|
@@ -38,6 +39,28 @@ async function serverPost(superblocksBaseUrl, jwt, path, body) {
|
|
|
38
39
|
}
|
|
39
40
|
return (await response.json());
|
|
40
41
|
}
|
|
42
|
+
function throwIfAborted(abortSignal) {
|
|
43
|
+
if (abortSignal?.aborted) {
|
|
44
|
+
throw new DOMException("Aborted", "AbortError");
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
function abortableDelay(ms, abortSignal) {
|
|
48
|
+
return new Promise((resolve, reject) => {
|
|
49
|
+
if (abortSignal?.aborted) {
|
|
50
|
+
reject(new DOMException("Aborted", "AbortError"));
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const onAbort = () => {
|
|
54
|
+
clearTimeout(timeoutId);
|
|
55
|
+
reject(new DOMException("Aborted", "AbortError"));
|
|
56
|
+
};
|
|
57
|
+
const timeoutId = setTimeout(() => {
|
|
58
|
+
abortSignal?.removeEventListener("abort", onAbort);
|
|
59
|
+
resolve();
|
|
60
|
+
}, ms);
|
|
61
|
+
abortSignal?.addEventListener("abort", onAbort, { once: true });
|
|
62
|
+
});
|
|
63
|
+
}
|
|
41
64
|
export function createDeployService(deps) {
|
|
42
65
|
const { applicationId, gitService, getJwt, snapshotUploader, superblocksBaseUrl, } = deps;
|
|
43
66
|
const logger = getLogger();
|
|
@@ -49,10 +72,12 @@ export function createDeployService(deps) {
|
|
|
49
72
|
return jwt;
|
|
50
73
|
}
|
|
51
74
|
return {
|
|
52
|
-
async prepareMainCommit(sha) {
|
|
75
|
+
async prepareMainCommit(sha, options = {}) {
|
|
76
|
+
throwIfAborted(options.abortSignal);
|
|
53
77
|
const worktreeBase = await mkdtemp(join(tmpdir(), "sb-main-deploy-"));
|
|
54
78
|
const worktreePath = join(worktreeBase, "worktree");
|
|
55
79
|
try {
|
|
80
|
+
throwIfAborted(options.abortSignal);
|
|
56
81
|
await gitService.raw([
|
|
57
82
|
"worktree",
|
|
58
83
|
"add",
|
|
@@ -60,11 +85,14 @@ export function createDeployService(deps) {
|
|
|
60
85
|
worktreePath,
|
|
61
86
|
sha,
|
|
62
87
|
]);
|
|
88
|
+
throwIfAborted(options.abortSignal);
|
|
63
89
|
await rm(join(worktreePath, ".git"), {
|
|
64
90
|
force: true,
|
|
65
91
|
recursive: true,
|
|
66
92
|
});
|
|
93
|
+
throwIfAborted(options.abortSignal);
|
|
67
94
|
const { directoryHash } = await snapshotUploader.uploadSnapshotToDbfs(worktreePath);
|
|
95
|
+
throwIfAborted(options.abortSignal);
|
|
68
96
|
const snapshotPath = join(SB_WORKTREE_SNAPSHOTS_DIR, encodeURIComponent(directoryHash));
|
|
69
97
|
await mkdir(SB_WORKTREE_SNAPSHOTS_DIR, { recursive: true });
|
|
70
98
|
await rm(snapshotPath, { recursive: true, force: true });
|
|
@@ -89,24 +117,27 @@ export function createDeployService(deps) {
|
|
|
89
117
|
await rm(worktreeBase, { recursive: true, force: true });
|
|
90
118
|
}
|
|
91
119
|
},
|
|
92
|
-
async syncMainToDbfs(directoryHash, sha) {
|
|
120
|
+
async syncMainToDbfs(directoryHash, sha, options = {}) {
|
|
121
|
+
throwIfAborted(options.abortSignal);
|
|
93
122
|
const jwt = requireJwt();
|
|
94
|
-
const result = await serverPost(superblocksBaseUrl, jwt, `v3/applications/${applicationId}/sync-main-to-dbfs`, { directoryHash, sha });
|
|
123
|
+
const result = await serverPost(superblocksBaseUrl, jwt, `v3/applications/${applicationId}/sync-main-to-dbfs`, { directoryHash, sha }, options);
|
|
95
124
|
const commitId = result.data?.commitId;
|
|
96
125
|
if (!commitId) {
|
|
97
126
|
throw new Error("Server did not return a commitId");
|
|
98
127
|
}
|
|
99
128
|
return { commitId };
|
|
100
129
|
},
|
|
101
|
-
async createBuild(directoryHash, commitId) {
|
|
130
|
+
async createBuild(directoryHash, commitId, options = {}) {
|
|
131
|
+
throwIfAborted(options.abortSignal);
|
|
102
132
|
const jwt = requireJwt();
|
|
103
|
-
await serverPost(superblocksBaseUrl, jwt, `v3/applications/${applicationId}/${encodeURIComponent(directoryHash)}/builds`, { commitId });
|
|
133
|
+
await serverPost(superblocksBaseUrl, jwt, `v3/applications/${applicationId}/${encodeURIComponent(directoryHash)}/builds`, { commitId }, options);
|
|
104
134
|
},
|
|
105
|
-
async pollBuildUntilComplete(directoryHash) {
|
|
135
|
+
async pollBuildUntilComplete(directoryHash, options = {}) {
|
|
106
136
|
const startTime = Date.now();
|
|
107
137
|
while (Date.now() - startTime < BUILD_POLL_TIMEOUT_MS) {
|
|
138
|
+
throwIfAborted(options.abortSignal);
|
|
108
139
|
const jwt = requireJwt();
|
|
109
|
-
const result = await serverPost(superblocksBaseUrl, jwt, `v3/applications/${applicationId}/build-bulk-status`, { directoryHashes: [directoryHash] });
|
|
140
|
+
const result = await serverPost(superblocksBaseUrl, jwt, `v3/applications/${applicationId}/build-bulk-status`, { directoryHashes: [directoryHash] }, options);
|
|
110
141
|
const entry = result.data?.directoryHashToStatus?.[directoryHash];
|
|
111
142
|
if (entry && TERMINAL_BUILD_STATUSES.has(entry.status)) {
|
|
112
143
|
if (isSuccessStatus(entry.status)) {
|
|
@@ -119,16 +150,17 @@ export function createDeployService(deps) {
|
|
|
119
150
|
return { succeeded: false, error: "Build timed out" };
|
|
120
151
|
}
|
|
121
152
|
}
|
|
122
|
-
await
|
|
153
|
+
await abortableDelay(BUILD_POLL_INTERVAL_MS, options.abortSignal);
|
|
123
154
|
}
|
|
124
155
|
return {
|
|
125
156
|
succeeded: false,
|
|
126
157
|
error: "Build polling timed out after 5 minutes",
|
|
127
158
|
};
|
|
128
159
|
},
|
|
129
|
-
async deployCommit(commitId, deployMessage) {
|
|
160
|
+
async deployCommit(commitId, deployMessage, options = {}) {
|
|
161
|
+
throwIfAborted(options.abortSignal);
|
|
130
162
|
const jwt = requireJwt();
|
|
131
|
-
await serverPost(superblocksBaseUrl, jwt, `v2/applications/${applicationId}/deployments`, { commitId, deployMessage });
|
|
163
|
+
await serverPost(superblocksBaseUrl, jwt, `v2/applications/${applicationId}/deployments`, { commitId, deployMessage }, options);
|
|
132
164
|
},
|
|
133
165
|
};
|
|
134
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-service.js","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/deploy-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAGvD,MAAM,yBAAyB,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,uBAAuB,CAAC,CAAC;AAC1E,MAAM,sBAAsB,GAAG,KAAK,CAAC;AACrC,MAAM,qBAAqB,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;AAE7C,MAAM,uBAAuB,GAAwB,IAAI,GAAG,CAAC;IAC3D,SAAS;IACT,sBAAsB;IACtB,QAAQ;IACR,qBAAqB;IACrB,WAAW;IACX,wBAAwB;CACzB,CAAC,CAAC;AAEH,SAAS,eAAe,CAAC,MAAc;IACrC,OAAO,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,sBAAsB,CAAC;AACnE,CAAC;AAED,SAAS,cAAc,CAAC,MAAc;IACpC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,qBAAqB,CAAC;AACjE,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAc;IACtC,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,wBAAwB,CAAC;AACvE,CAAC;AAgBD,KAAK,UAAU,UAAU,CACvB,kBAA0B,EAC1B,GAAW,EACX,IAAY,EACZ,IAAa;
|
|
1
|
+
{"version":3,"file":"deploy-service.js","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/deploy-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export declare const PLAN_GEN_THINKING_OPTIONS: {
|
|
|
5
5
|
readonly budgetTokens: 0;
|
|
6
6
|
readonly interleaved: false;
|
|
7
7
|
};
|
|
8
|
+
declare const PlanComplexityLevels: readonly ["Extra Small", "Small", "Medium", "Large", "Extra Large"];
|
|
8
9
|
/**
|
|
9
10
|
* Exit Plan Mode - prompts the user to exit Plan mode when they have finished planning and are ready to code.
|
|
10
11
|
*/
|
|
@@ -12,16 +13,25 @@ export declare const exitPlanModeToolFactory: import("../types.js").ToolFactory<
|
|
|
12
13
|
clark: Clark;
|
|
13
14
|
services: ClarkStateHandlerParams;
|
|
14
15
|
}, import("../types.js").Tool<{
|
|
16
|
+
complexity: (typeof PlanComplexityLevels)[number];
|
|
15
17
|
title: string;
|
|
16
18
|
integrationIds: string[];
|
|
17
|
-
complexity: "Extra Small" | "Small" | "Medium" | "Large" | "Extra Large";
|
|
18
19
|
attachmentIds: number[];
|
|
19
20
|
entityIds: string[];
|
|
20
|
-
includesFreshDatabase?: boolean
|
|
21
|
+
includesFreshDatabase?: boolean;
|
|
21
22
|
}, {
|
|
23
|
+
success: boolean;
|
|
24
|
+
peerDisconnected: boolean;
|
|
25
|
+
message: string;
|
|
26
|
+
displaced?: undefined;
|
|
27
|
+
plan?: undefined;
|
|
28
|
+
title?: undefined;
|
|
29
|
+
complexity?: undefined;
|
|
30
|
+
} | {
|
|
22
31
|
success: boolean;
|
|
23
32
|
displaced: boolean;
|
|
24
33
|
message: string;
|
|
34
|
+
peerDisconnected?: undefined;
|
|
25
35
|
plan?: undefined;
|
|
26
36
|
title?: undefined;
|
|
27
37
|
complexity?: undefined;
|
|
@@ -31,8 +41,10 @@ export declare const exitPlanModeToolFactory: import("../types.js").ToolFactory<
|
|
|
31
41
|
title: string;
|
|
32
42
|
complexity: "Extra Small" | "Small" | "Medium" | "Large" | "Extra Large";
|
|
33
43
|
success?: undefined;
|
|
44
|
+
peerDisconnected?: undefined;
|
|
34
45
|
displaced?: undefined;
|
|
35
46
|
} | undefined>>;
|
|
36
47
|
export declare const EXIT_PLAN_MODE_PLAN_GENERATION_PROMPT_PREFIX = "Based on our conversation and the information gathered, create a specific, actionable plan.";
|
|
37
48
|
export declare const PLAN_RETRY_NO_TEXT_NUDGE: string;
|
|
49
|
+
export {};
|
|
38
50
|
//# sourceMappingURL=exit-plan-mode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exit-plan-mode.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/exit-plan-mode.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,KAAK,EACL,uBAAuB,EACxB,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"exit-plan-mode.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/exit-plan-mode.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,KAAK,EACL,uBAAuB,EACxB,MAAM,qCAAqC,CAAC;AAe7C,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAWzC,eAAO,MAAM,yBAAyB;;;;CAI5B,CAAC;AAsBX,QAAA,MAAM,oBAAoB,qEAMhB,CAAC;AAiBX;;GAEG;AACH,eAAO,MAAM,uBAAuB;WAMzB,KAAK;cACF,uBAAuB;;gBA6Df,CAAC,OAAO,oBAAoB,EAAE,MAAM,CAAC;WAC1C,MAAM;oBACG,MAAM,EAAE;mBACT,MAAM,EAAE;eACZ,MAAM,EAAE;4BACK,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;eAsaxC,CAAC;AAUF,eAAO,MAAM,4CAA4C,gGACsC,CAAC;AAKhG,eAAO,MAAM,wBAAwB,QAGG,CAAC"}
|
|
@@ -8,6 +8,7 @@ import { sendInteractiveMessageChannel, sendUserMessageChannel, } from "../../..
|
|
|
8
8
|
import { createToolFactory, PermissionLevel, ToolCategory } from "../types.js";
|
|
9
9
|
const MAX_ATTEMPTS = 5;
|
|
10
10
|
const MAX_PLAN_ATTACHMENTS = 5;
|
|
11
|
+
const TOOL_EXECUTION_TIMEOUT_MS = 30 * 60 * 1000;
|
|
11
12
|
// Reasoning-only empty text (finishReason:stop, no text-delta) does not recover
|
|
12
13
|
// by retrying: the input is identical so every attempt reproduces it. We give
|
|
13
14
|
// the nudged retry exactly one chance to break the loop, then stop instead of
|
|
@@ -65,38 +66,50 @@ function formatIntegrationForPlanPrompt(integration) {
|
|
|
65
66
|
* Exit Plan Mode - prompts the user to exit Plan mode when they have finished planning and are ready to code.
|
|
66
67
|
*/
|
|
67
68
|
export const exitPlanModeToolFactory = createToolFactory("exitPlanMode", ({ clark, services, }) => {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
title
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
69
|
+
const managedNativeDbEnabled = services.features.managedNativeDbEnabled === true;
|
|
70
|
+
// Build the base input schema
|
|
71
|
+
const baseInputSchema = z.object({
|
|
72
|
+
complexity: z
|
|
73
|
+
.enum(PlanComplexityLevels)
|
|
74
|
+
.describe("Your best estimate of the plan complexity"),
|
|
75
|
+
title: z
|
|
76
|
+
.string()
|
|
77
|
+
.min(1, "Plan title is required")
|
|
78
|
+
.max(160, "Plan title must be 160 characters or fewer")
|
|
79
|
+
.describe("Title to display for the plan. Should be the name of the feature or fix, eg 'Executive orders dashboard', 'User login page', 'Fix data sync bug'"),
|
|
80
|
+
integrationIds: z
|
|
81
|
+
.array(z.string())
|
|
82
|
+
.describe("List of integration IDs that may be referenced in the plan."),
|
|
83
|
+
attachmentIds: z
|
|
84
|
+
.array(z.number())
|
|
85
|
+
.min(0)
|
|
86
|
+
.max(MAX_PLAN_ATTACHMENTS)
|
|
87
|
+
.describe(`List of up to ${MAX_PLAN_ATTACHMENTS} attachment IDs that are relevant to the plan. Call listAttachments first to see available attachments with their IDs, types, and labels.`),
|
|
88
|
+
entityIds: z
|
|
89
|
+
.array(z.string())
|
|
90
|
+
.min(0)
|
|
91
|
+
.describe(`List of targeted entity IDs (components) from the user's selection that are relevant to implementing this plan. Include entities that the plan will modify or depend on.`),
|
|
92
|
+
});
|
|
93
|
+
// Conditionally add includesFreshDatabase field only when managed native DB is enabled
|
|
94
|
+
const inputSchema = managedNativeDbEnabled
|
|
95
|
+
? baseInputSchema.extend({
|
|
94
96
|
includesFreshDatabase: z
|
|
95
97
|
.boolean()
|
|
96
98
|
.optional()
|
|
97
99
|
.describe("Set to true only when the plan explicitly calls provisionDatabase to create a new dev database. Do not set it for plans that query, migrate, or modify an existing database."),
|
|
98
|
-
})
|
|
99
|
-
|
|
100
|
+
})
|
|
101
|
+
: baseInputSchema;
|
|
102
|
+
// Build description conditionally based on feature flag
|
|
103
|
+
const description = buildExitPlanModeDescription(managedNativeDbEnabled);
|
|
104
|
+
return {
|
|
105
|
+
description,
|
|
106
|
+
category: ToolCategory.PLAN,
|
|
107
|
+
defaultPermission: PermissionLevel.ALLOW,
|
|
108
|
+
readOnly: true,
|
|
109
|
+
timeoutMs: TOOL_EXECUTION_TIMEOUT_MS,
|
|
110
|
+
inputSchema,
|
|
111
|
+
execute: async (input, { abortSignal, messages }) => {
|
|
112
|
+
const { complexity, title, integrationIds, attachmentIds, entityIds, includesFreshDatabase, } = input;
|
|
100
113
|
const { chatSessionStore } = services;
|
|
101
114
|
const sendUserMessage = sendUserMessageChannel(clark, chatSessionStore);
|
|
102
115
|
const sendInteractiveMessage = sendInteractiveMessageChannel(clark, chatSessionStore);
|
|
@@ -172,6 +185,7 @@ ${filteredIntegrations
|
|
|
172
185
|
}
|
|
173
186
|
: planPrompt;
|
|
174
187
|
const result = await clark.streamText(services, {
|
|
188
|
+
abortSignal,
|
|
175
189
|
user: attemptPrompt,
|
|
176
190
|
context: { messages },
|
|
177
191
|
enableFallback: false,
|
|
@@ -229,15 +243,14 @@ ${filteredIntegrations
|
|
|
229
243
|
id: crypto.randomUUID(),
|
|
230
244
|
});
|
|
231
245
|
if (!result.success) {
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
// and the model receives advice it can act on.
|
|
246
|
+
if (result.peerDisconnected) {
|
|
247
|
+
getLogger().warn("[exitPlanMode] Plan card was not delivered because the editor peer disconnected.");
|
|
248
|
+
return {
|
|
249
|
+
success: false,
|
|
250
|
+
peerDisconnected: true,
|
|
251
|
+
message: "Plan could not be presented because the editor peer disconnected before delivery. Wait for the user to reconnect before retrying.",
|
|
252
|
+
};
|
|
253
|
+
}
|
|
241
254
|
getLogger().warn("[exitPlanMode] Plan card was displaced by an in-flight interactive prompt; surfacing structured failure to the model.");
|
|
242
255
|
return {
|
|
243
256
|
success: false,
|
|
@@ -519,7 +532,7 @@ Navigation & Behavior
|
|
|
519
532
|
- Match dashboard styling and layout
|
|
520
533
|
</plan>
|
|
521
534
|
`;
|
|
522
|
-
const
|
|
535
|
+
const EXIT_PLAN_MODE_DESCRIPTION_INTRO = `
|
|
523
536
|
Use this tool to delegate to a planning expert who will generate a plan and present it to the user.
|
|
524
537
|
This tool presents a plan with a "Build It" button that allows the user to switch to Build mode.
|
|
525
538
|
NEVER output a plan directly as text - ALWAYS use this tool to present plans properly.
|
|
@@ -535,12 +548,14 @@ ENTITIES:
|
|
|
535
548
|
- If there are focused_entities in the context (components selected by the user), extract the "id" field from each entity
|
|
536
549
|
- Pass these IDs to the entityIds parameter - they will be displayed in the plan and preserved for build mode
|
|
537
550
|
- Include the relevant focused entity IDs unless they are clearly irrelevant to the plan
|
|
538
|
-
|
|
551
|
+
`;
|
|
552
|
+
const EXIT_PLAN_MODE_DATABASE_SECTION = `
|
|
539
553
|
DATABASE:
|
|
540
554
|
- Set includesFreshDatabase to true ONLY when the plan explicitly calls the provisionDatabase tool to create a new dev database
|
|
541
555
|
- Do NOT set includesFreshDatabase for plans that merely query, migrate, or modify an existing database
|
|
542
556
|
- This shows a "Fresh Database" indicator on the plan card so the user knows a new database will be created
|
|
543
|
-
|
|
557
|
+
`;
|
|
558
|
+
const EXIT_PLAN_MODE_DESCRIPTION_OUTRO = `
|
|
544
559
|
Before presenting a plan:
|
|
545
560
|
- If the user's request is ambiguous or has multiple interpretations, use askMultiChoice to clarify
|
|
546
561
|
- If there are unknowns about requirements, preferences, or approach, use askMultiChoice first
|
|
@@ -586,4 +601,16 @@ After calling this tool, the user will either:
|
|
|
586
601
|
Remember: Always use this tool to present plans - never output plans directly as text.
|
|
587
602
|
IF THE TOOL CALL FAILS, DO NOT ATTEMPT TO GENERATE THE PLAN YOURSELF. Call the tool again.
|
|
588
603
|
`;
|
|
604
|
+
/**
|
|
605
|
+
* Build the tool description, conditionally including the DATABASE section
|
|
606
|
+
* only when managedNativeDbEnabled is true.
|
|
607
|
+
*/
|
|
608
|
+
function buildExitPlanModeDescription(managedNativeDbEnabled) {
|
|
609
|
+
if (managedNativeDbEnabled) {
|
|
610
|
+
return (EXIT_PLAN_MODE_DESCRIPTION_INTRO +
|
|
611
|
+
EXIT_PLAN_MODE_DATABASE_SECTION +
|
|
612
|
+
EXIT_PLAN_MODE_DESCRIPTION_OUTRO);
|
|
613
|
+
}
|
|
614
|
+
return EXIT_PLAN_MODE_DESCRIPTION_INTRO + EXIT_PLAN_MODE_DESCRIPTION_OUTRO;
|
|
615
|
+
}
|
|
589
616
|
//# sourceMappingURL=exit-plan-mode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exit-plan-mode.js","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/exit-plan-mode.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"exit-plan-mode.js","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/exit-plan-mode.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,9 @@ import type { GitService } from "../../../../git-service/index.js";
|
|
|
6
6
|
export interface GitPullSyncService {
|
|
7
7
|
uploadDirectory(source: string): void;
|
|
8
8
|
}
|
|
9
|
+
export interface GitDeployOperationOptions {
|
|
10
|
+
abortSignal?: AbortSignal;
|
|
11
|
+
}
|
|
9
12
|
/**
|
|
10
13
|
* Service that handles the multi-step deploy pipeline:
|
|
11
14
|
* prepare commit snapshot → sync to DBFS → build → poll → deploy.
|
|
@@ -15,23 +18,23 @@ export interface GitPullSyncService {
|
|
|
15
18
|
*/
|
|
16
19
|
export interface GitDeployService {
|
|
17
20
|
/** Create a git worktree at the given SHA and upload the snapshot to DBFS. */
|
|
18
|
-
prepareMainCommit(sha: string): Promise<{
|
|
21
|
+
prepareMainCommit(sha: string, options?: GitDeployOperationOptions): Promise<{
|
|
19
22
|
directoryHash: string;
|
|
20
23
|
sha: string;
|
|
21
24
|
}>;
|
|
22
25
|
/** Register the snapshot with the server, returning the internal commit ID. */
|
|
23
|
-
syncMainToDbfs(directoryHash: string, sha: string): Promise<{
|
|
26
|
+
syncMainToDbfs(directoryHash: string, sha: string, options?: GitDeployOperationOptions): Promise<{
|
|
24
27
|
commitId: string;
|
|
25
28
|
}>;
|
|
26
29
|
/** Kick off a SABS build for the given directory hash and commit. */
|
|
27
|
-
createBuild(directoryHash: string, commitId: string): Promise<void>;
|
|
30
|
+
createBuild(directoryHash: string, commitId: string, options?: GitDeployOperationOptions): Promise<void>;
|
|
28
31
|
/** Poll until the build reaches a terminal status (success, failed, or timed out). */
|
|
29
|
-
pollBuildUntilComplete(directoryHash: string): Promise<{
|
|
32
|
+
pollBuildUntilComplete(directoryHash: string, options?: GitDeployOperationOptions): Promise<{
|
|
30
33
|
succeeded: boolean;
|
|
31
34
|
error?: string;
|
|
32
35
|
}>;
|
|
33
36
|
/** Create a production deployment for the given commit. */
|
|
34
|
-
deployCommit(commitId: string, deployMessage: string): Promise<void>;
|
|
37
|
+
deployCommit(commitId: string, deployMessage: string, options?: GitDeployOperationOptions): Promise<void>;
|
|
35
38
|
}
|
|
36
39
|
export interface GitToolDeps {
|
|
37
40
|
gitService?: GitService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/git.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,mCAAmC,CAAC;AAQ3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAUnE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,8EAA8E;IAC9E,iBAAiB,CACf,GAAG,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/agent/tools2/tools/git.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,mCAAmC,CAAC;AAQ3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAUnE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,8EAA8E;IAC9E,iBAAiB,CACf,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,yBAAyB,GAClC,OAAO,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEnD,+EAA+E;IAC/E,cAAc,CACZ,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,yBAAyB,GAClC,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEjC,qEAAqE;IACrE,WAAW,CACT,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,yBAAyB,GAClC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,sFAAsF;IACtF,sBAAsB,CACpB,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,yBAAyB,GAClC,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEnD,2DAA2D;IAC3D,YAAY,CACV,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,yBAAyB,GAClC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9D,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,kBAAkB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,gBAAgB,CAAC;CAClC;AAmXD,eAAO,MAAM,cAAc;;;;;;;;;;aA7QZ,IAAI;;aAEJ,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;;UAExD,MAAM;;WACL,OAAO,EAAE;WAAS,MAAM;YAAU,MAAM;;SAG1C,MAAM;YAAU,IAAI;UAAQ,MAAM;;SAClC,MAAM;YAAU,KAAK;WAAS,MAAM;;YAEjC,MAAM,EAAE;;WACT,MAAM;cAAY,QAAQ;;cACvB,IAAI;SAAO,MAAM;cAAY,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+5BhD,CAAC"}
|
|
@@ -17,6 +17,7 @@ const GIT_OPERATIONS = [
|
|
|
17
17
|
"stage",
|
|
18
18
|
"status",
|
|
19
19
|
];
|
|
20
|
+
const TOOL_EXECUTION_TIMEOUT_MS = 15 * 60 * 1000;
|
|
20
21
|
const gitInputSchema = z
|
|
21
22
|
.object({
|
|
22
23
|
operation: z.enum(GIT_OPERATIONS).describe("The git operation to run"),
|
|
@@ -297,16 +298,26 @@ async function getRepositoryWebUrl(gitService) {
|
|
|
297
298
|
return undefined;
|
|
298
299
|
}
|
|
299
300
|
}
|
|
301
|
+
function throwIfAborted(abortSignal) {
|
|
302
|
+
if (abortSignal?.aborted) {
|
|
303
|
+
throw new DOMException("Aborted", "AbortError");
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
function isAbortError(error) {
|
|
307
|
+
return error instanceof Error && error.name === "AbortError";
|
|
308
|
+
}
|
|
300
309
|
export const gitToolFactory = createToolFactory("git", (deps) => ({
|
|
301
310
|
description: GIT_DESCRIPTION,
|
|
302
311
|
category: ToolCategory.GIT,
|
|
303
312
|
defaultPermission: PermissionLevel.ALLOW,
|
|
304
313
|
readOnly: true,
|
|
314
|
+
timeoutMs: TOOL_EXECUTION_TIMEOUT_MS,
|
|
305
315
|
inputSchema: gitInputSchema,
|
|
306
316
|
getActionName: (input) => getActionNameForOp(input),
|
|
307
317
|
formatInput: (input) => formatInputForOp(input),
|
|
308
|
-
execute: async (input) => {
|
|
318
|
+
execute: async (input, options) => {
|
|
309
319
|
const logger = getLogger();
|
|
320
|
+
const abortSignal = options?.abortSignal;
|
|
310
321
|
const { gitService, syncService, gitOperationLock, onGitOperationComplete, onGitSetupRequired, } = deps;
|
|
311
322
|
if (!gitService) {
|
|
312
323
|
await onGitSetupRequired?.();
|
|
@@ -646,6 +657,9 @@ export const gitToolFactory = createToolFactory("git", (deps) => ({
|
|
|
646
657
|
};
|
|
647
658
|
}
|
|
648
659
|
case "deploy": {
|
|
660
|
+
const deployOptions = abortSignal
|
|
661
|
+
? { abortSignal }
|
|
662
|
+
: {};
|
|
649
663
|
const { deployService, applicationId } = deps;
|
|
650
664
|
if (!deployService) {
|
|
651
665
|
throw new ToolExecutionError("Deploy is not available: deploy service is not configured.", {
|
|
@@ -729,11 +743,14 @@ export const gitToolFactory = createToolFactory("git", (deps) => ({
|
|
|
729
743
|
let directoryHash;
|
|
730
744
|
let resolvedSha;
|
|
731
745
|
try {
|
|
732
|
-
const prepared = await deployService.prepareMainCommit(fullSha);
|
|
746
|
+
const prepared = await deployService.prepareMainCommit(fullSha, deployOptions);
|
|
733
747
|
directoryHash = prepared.directoryHash;
|
|
734
748
|
resolvedSha = prepared.sha;
|
|
735
749
|
}
|
|
736
750
|
catch (error) {
|
|
751
|
+
if (isAbortError(error)) {
|
|
752
|
+
throw error;
|
|
753
|
+
}
|
|
737
754
|
logger.warn("[git] deploy failed at prepare stage", {
|
|
738
755
|
sha: fullSha,
|
|
739
756
|
error: error instanceof Error ? error.message : String(error),
|
|
@@ -747,10 +764,13 @@ export const gitToolFactory = createToolFactory("git", (deps) => ({
|
|
|
747
764
|
}
|
|
748
765
|
let commitId;
|
|
749
766
|
try {
|
|
750
|
-
const synced = await deployService.syncMainToDbfs(directoryHash, resolvedSha);
|
|
767
|
+
const synced = await deployService.syncMainToDbfs(directoryHash, resolvedSha, deployOptions);
|
|
751
768
|
commitId = synced.commitId;
|
|
752
769
|
}
|
|
753
770
|
catch (error) {
|
|
771
|
+
if (isAbortError(error)) {
|
|
772
|
+
throw error;
|
|
773
|
+
}
|
|
754
774
|
logger.warn("[git] deploy failed at sync stage", {
|
|
755
775
|
sha: fullSha,
|
|
756
776
|
error: error instanceof Error ? error.message : String(error),
|
|
@@ -763,9 +783,12 @@ export const gitToolFactory = createToolFactory("git", (deps) => ({
|
|
|
763
783
|
};
|
|
764
784
|
}
|
|
765
785
|
try {
|
|
766
|
-
await deployService.createBuild(directoryHash, commitId);
|
|
786
|
+
await deployService.createBuild(directoryHash, commitId, deployOptions);
|
|
767
787
|
}
|
|
768
788
|
catch (error) {
|
|
789
|
+
if (isAbortError(error)) {
|
|
790
|
+
throw error;
|
|
791
|
+
}
|
|
769
792
|
logger.warn("[git] deploy failed at build_create stage", {
|
|
770
793
|
sha: fullSha,
|
|
771
794
|
error: error instanceof Error ? error.message : String(error),
|
|
@@ -779,10 +802,12 @@ export const gitToolFactory = createToolFactory("git", (deps) => ({
|
|
|
779
802
|
}
|
|
780
803
|
let buildResult;
|
|
781
804
|
try {
|
|
782
|
-
buildResult =
|
|
783
|
-
await deployService.pollBuildUntilComplete(directoryHash);
|
|
805
|
+
buildResult = await deployService.pollBuildUntilComplete(directoryHash, deployOptions);
|
|
784
806
|
}
|
|
785
807
|
catch (error) {
|
|
808
|
+
if (isAbortError(error)) {
|
|
809
|
+
throw error;
|
|
810
|
+
}
|
|
786
811
|
logger.warn("[git] deploy failed at build_poll stage", {
|
|
787
812
|
sha: fullSha,
|
|
788
813
|
error: error instanceof Error ? error.message : String(error),
|
|
@@ -806,10 +831,14 @@ export const gitToolFactory = createToolFactory("git", (deps) => ({
|
|
|
806
831
|
error: buildResult.error ?? "Build failed or timed out.",
|
|
807
832
|
};
|
|
808
833
|
}
|
|
834
|
+
throwIfAborted(abortSignal);
|
|
809
835
|
try {
|
|
810
|
-
await deployService.deployCommit(commitId, commitMessage);
|
|
836
|
+
await deployService.deployCommit(commitId, commitMessage, deployOptions);
|
|
811
837
|
}
|
|
812
838
|
catch (error) {
|
|
839
|
+
if (isAbortError(error)) {
|
|
840
|
+
throw error;
|
|
841
|
+
}
|
|
813
842
|
logger.warn("[git] deploy failed at deploy stage", {
|
|
814
843
|
sha: fullSha,
|
|
815
844
|
error: error instanceof Error ? error.message : String(error),
|