codecane 1.0.344 → 1.0.346
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/checkpoints/checkpoint-manager.js +6 -1
- package/dist/checkpoints/checkpoint-manager.js.map +1 -1
- package/dist/checkpoints/file-manager.js +104 -7
- package/dist/checkpoints/file-manager.js.map +1 -1
- package/dist/cli-definitions.js +2 -2
- package/dist/cli-definitions.js.map +1 -1
- package/dist/cli-handlers/checkpoint.d.ts +1 -0
- package/dist/cli-handlers/checkpoint.js +11 -7
- package/dist/cli-handlers/checkpoint.js.map +1 -1
- package/dist/client.js +14 -11
- package/dist/client.js.map +1 -1
- package/dist/common/constants.d.ts +2 -0
- package/dist/common/constants.js +2 -0
- package/dist/common/constants.js.map +1 -1
- package/dist/common/db/schema.d.ts +110 -1
- package/dist/common/db/schema.js +18 -1
- package/dist/common/db/schema.js.map +1 -1
- package/dist/common/util/string.d.ts +1 -0
- package/dist/common/util/string.js +12 -2
- package/dist/common/util/string.js.map +1 -1
- package/dist/index.js +18 -0
- package/dist/menu.js +1 -1
- package/dist/menu.js.map +1 -1
- package/dist/project-files.d.ts +4 -0
- package/dist/project-files.js +7 -0
- package/dist/project-files.js.map +1 -1
- package/dist/terminal/base.d.ts +1 -1
- package/dist/terminal/base.js +22 -41
- package/dist/terminal/base.js.map +1 -1
- package/dist/utils/git.js +5 -3
- package/dist/utils/git.js.map +1 -1
- package/package.json +3 -3
|
@@ -11,8 +11,9 @@ const worker_threads_1 = require("worker_threads");
|
|
|
11
11
|
const project_file_tree_1 = require("../common/project-file-tree");
|
|
12
12
|
const picocolors_1 = require("picocolors");
|
|
13
13
|
const project_files_1 = require("../project-files");
|
|
14
|
-
const
|
|
14
|
+
const git_1 = require("../utils/git");
|
|
15
15
|
const logger_1 = require("../utils/logger");
|
|
16
|
+
const file_manager_1 = require("./file-manager");
|
|
16
17
|
class CheckpointsDisabledError extends Error {
|
|
17
18
|
constructor(message, options) {
|
|
18
19
|
super(message, options);
|
|
@@ -102,6 +103,10 @@ class CheckpointManager {
|
|
|
102
103
|
if (this.disabledReason !== null) {
|
|
103
104
|
throw new CheckpointsDisabledError(this.disabledReason);
|
|
104
105
|
}
|
|
106
|
+
if (!(0, git_1.gitCommandIsAvailable)()) {
|
|
107
|
+
this.disabledReason = 'Git required for checkpoints';
|
|
108
|
+
throw new CheckpointsDisabledError(this.disabledReason);
|
|
109
|
+
}
|
|
105
110
|
const id = this.checkpoints.length + 1;
|
|
106
111
|
const projectDir = (0, project_files_1.getProjectRoot)();
|
|
107
112
|
if (projectDir === os_1.default.homedir()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint-manager.js","sourceRoot":"","sources":["../../src/checkpoints/checkpoint-manager.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAC3B,4CAAmB;AACnB,+BAA2B;AAC3B,mDAAuC;AAEvC,gEAA6E;AAE7E,2CAA2E;AAE3E,oDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"checkpoint-manager.js","sourceRoot":"","sources":["../../src/checkpoints/checkpoint-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -15,8 +38,9 @@ const crypto_1 = require("crypto");
|
|
|
15
38
|
const fs_1 = __importDefault(require("fs"));
|
|
16
39
|
exports.fs = fs_1.default;
|
|
17
40
|
const os_1 = __importDefault(require("os"));
|
|
18
|
-
const path_1 = require("path");
|
|
41
|
+
const path_1 = __importStar(require("path"));
|
|
19
42
|
const isomorphic_git_1 = require("isomorphic-git");
|
|
43
|
+
const array_1 = require("../common/util/array");
|
|
20
44
|
const project_files_1 = require("../project-files");
|
|
21
45
|
const git_1 = require("../utils/git");
|
|
22
46
|
const logger_1 = require("../utils/logger");
|
|
@@ -49,12 +73,11 @@ async function hasUnsavedChanges({ projectDir, bareRepoPath, relativeFilepaths,
|
|
|
49
73
|
'status',
|
|
50
74
|
'--porcelain',
|
|
51
75
|
], { stdio: ['ignore', 'pipe', 'ignore'] }).toString();
|
|
52
|
-
return output
|
|
76
|
+
return !!output;
|
|
53
77
|
}
|
|
54
78
|
catch (error) {
|
|
55
79
|
logger_1.logger.error({
|
|
56
|
-
|
|
57
|
-
errorStack: error instanceof Error ? error.stack : undefined,
|
|
80
|
+
error,
|
|
58
81
|
projectDir,
|
|
59
82
|
bareRepoPath,
|
|
60
83
|
}, 'Error running git status for unsaved changes check');
|
|
@@ -154,6 +177,8 @@ async function gitAddAll({ projectDir, bareRepoPath, relativeFilepaths, }) {
|
|
|
154
177
|
projectDir,
|
|
155
178
|
'add',
|
|
156
179
|
'.',
|
|
180
|
+
':!**/*.codebuffbackup',
|
|
181
|
+
':!**/*.codebuffbackup/**',
|
|
157
182
|
], { stdio: 'ignore' });
|
|
158
183
|
return;
|
|
159
184
|
}
|
|
@@ -210,6 +235,79 @@ async function gitAddAll({ projectDir, bareRepoPath, relativeFilepaths, }) {
|
|
|
210
235
|
}
|
|
211
236
|
}
|
|
212
237
|
}
|
|
238
|
+
async function gitAddAllIgnoringNestedRepos({ projectDir, bareRepoPath, relativeFilepaths, }) {
|
|
239
|
+
const allNestedRepos = [];
|
|
240
|
+
try {
|
|
241
|
+
while (true) {
|
|
242
|
+
await gitAddAll({ projectDir, bareRepoPath, relativeFilepaths });
|
|
243
|
+
let output;
|
|
244
|
+
try {
|
|
245
|
+
output = (0, child_process_1.execFileSync)('git', [
|
|
246
|
+
'--git-dir',
|
|
247
|
+
bareRepoPath,
|
|
248
|
+
'--work-tree',
|
|
249
|
+
projectDir,
|
|
250
|
+
'status',
|
|
251
|
+
'--porcelain',
|
|
252
|
+
], { stdio: ['ignore', 'pipe', 'ignore'] }).toString();
|
|
253
|
+
}
|
|
254
|
+
catch (error) {
|
|
255
|
+
logger_1.logger.error({ error, projectDir, bareRepoPath }, 'Failed to get git status while finding nested git repos');
|
|
256
|
+
return;
|
|
257
|
+
}
|
|
258
|
+
if (!output) {
|
|
259
|
+
break;
|
|
260
|
+
}
|
|
261
|
+
const nestedRepos = (0, array_1.buildArray)(output.split('\n'))
|
|
262
|
+
.filter((line) => line[1] === 'M')
|
|
263
|
+
.map((line) => line.slice(3).trim());
|
|
264
|
+
if (nestedRepos.length === 0) {
|
|
265
|
+
break;
|
|
266
|
+
}
|
|
267
|
+
for (const nestedRepo of nestedRepos) {
|
|
268
|
+
try {
|
|
269
|
+
fs_1.default.renameSync(path_1.default.join(projectDir, nestedRepo, '.git'), path_1.default.join(projectDir, nestedRepo, '.git.codebuffbackup'));
|
|
270
|
+
allNestedRepos.push(nestedRepo);
|
|
271
|
+
}
|
|
272
|
+
catch (error) {
|
|
273
|
+
logger_1.logger.error({
|
|
274
|
+
error,
|
|
275
|
+
nestedRepo,
|
|
276
|
+
}, 'Failed to backup .git directory for nested repo');
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
(0, child_process_1.execFileSync)('git', [
|
|
280
|
+
'--git-dir',
|
|
281
|
+
bareRepoPath,
|
|
282
|
+
'--work-tree',
|
|
283
|
+
projectDir,
|
|
284
|
+
'-C',
|
|
285
|
+
projectDir,
|
|
286
|
+
'rm',
|
|
287
|
+
'--cached',
|
|
288
|
+
'-rf',
|
|
289
|
+
...nestedRepos,
|
|
290
|
+
]);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
finally {
|
|
294
|
+
for (const nestedRepo of allNestedRepos) {
|
|
295
|
+
const codebuffBackup = path_1.default.join(projectDir, nestedRepo, '.git.codebuffbackup');
|
|
296
|
+
const gitDir = path_1.default.join(projectDir, nestedRepo, '.git');
|
|
297
|
+
try {
|
|
298
|
+
fs_1.default.renameSync(codebuffBackup, gitDir);
|
|
299
|
+
}
|
|
300
|
+
catch (error) {
|
|
301
|
+
console.error(`Failed to restore .git directory for nested repo. Please rename ${codebuffBackup} to ${gitDir}\n${{ error }}`);
|
|
302
|
+
logger_1.logger.error({
|
|
303
|
+
errorMessage: error instanceof Error ? error.message : String(error),
|
|
304
|
+
errorStack: error instanceof Error ? error.stack : undefined,
|
|
305
|
+
nestedRepo,
|
|
306
|
+
}, 'Failed to restore .git directory for nested repo');
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
}
|
|
213
311
|
async function gitCommit({ projectDir, bareRepoPath, message, }) {
|
|
214
312
|
if ((0, git_1.gitCommandIsAvailable)()) {
|
|
215
313
|
try {
|
|
@@ -256,8 +354,7 @@ async function gitCommit({ projectDir, bareRepoPath, message, }) {
|
|
|
256
354
|
}
|
|
257
355
|
catch (error) {
|
|
258
356
|
logger_1.logger.error({
|
|
259
|
-
|
|
260
|
-
errorStack: error instanceof Error ? error.stack : undefined,
|
|
357
|
+
error,
|
|
261
358
|
projectDir,
|
|
262
359
|
bareRepoPath,
|
|
263
360
|
}, 'Unable to checkout with git command');
|
|
@@ -276,7 +373,7 @@ async function gitCommit({ projectDir, bareRepoPath, message, }) {
|
|
|
276
373
|
* @returns Promise resolving to the new commit's hash
|
|
277
374
|
*/
|
|
278
375
|
async function storeFileState({ projectDir, bareRepoPath, message, relativeFilepaths: relativeFilepaths, }) {
|
|
279
|
-
await
|
|
376
|
+
await gitAddAllIgnoringNestedRepos({
|
|
280
377
|
projectDir,
|
|
281
378
|
bareRepoPath,
|
|
282
379
|
relativeFilepaths,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-manager.js","sourceRoot":"","sources":["../../src/checkpoints/file-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-manager.js","sourceRoot":"","sources":["../../src/checkpoints/file-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/cli-definitions.js
CHANGED
|
@@ -47,8 +47,8 @@ exports.cliOptions = [
|
|
|
47
47
|
},
|
|
48
48
|
{
|
|
49
49
|
flags: '--ask',
|
|
50
|
-
description:
|
|
51
|
-
menuDescription:
|
|
50
|
+
description: "Start in ask mode (won't change code)",
|
|
51
|
+
menuDescription: "Start in ask mode (won't change code)",
|
|
52
52
|
hidden: false,
|
|
53
53
|
},
|
|
54
54
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-definitions.js","sourceRoot":"","sources":["../src/cli-definitions.ts"],"names":[],"mappings":";;;AAQa,QAAA,YAAY,GAAe;IACtC;QACE,KAAK,EAAE,qBAAqB;QAC5B,WAAW,EAAE,gDAAgD;KAC9D;IACD;QACE,KAAK,EAAE,qBAAqB;QAC5B,WAAW,EAAE,wBAAwB;QACrC,eAAe,EAAE,oCAAoC;KACtD;CACF,CAAA;AAEY,QAAA,UAAU,GAAe;IACpC;QACE,KAAK,EAAE,4BAA4B;QACnC,WAAW,EAAE,kCAAkC;QAC/C,WAAW,EAAE;YACX,6DAA6D;YAC7D,8BAA8B;YAC9B,2DAA2D;SAC5D;KACF;IACD;QACE,KAAK,EAAE,QAAQ;QACf,WAAW,EACT,+DAA+D;QACjE,eAAe,EAAE,qCAAqC;KACvD;IACD;QACE,KAAK,EAAE,iBAAiB;QACxB,WAAW,EACT,yMAAyM;QAC3M,eAAe,EAAE,sDAAsD;QACvE,MAAM,EAAE,IAAI;KACb;IACD;QACE,KAAK,EAAE,QAAQ;QACf,WAAW,EAAE,uCAAuC;QACpD,eAAe,EAAE,gDAAgD;QACjE,MAAM,EAAE,KAAK;KACd;IACD;QACE,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,gDAAgD;QAC7D,eAAe,EACb,2DAA2D;QAC7D,MAAM,EAAE,KAAK;KACd;IACD;QACE,KAAK,EAAE,OAAO;QACd,WAAW,
|
|
1
|
+
{"version":3,"file":"cli-definitions.js","sourceRoot":"","sources":["../src/cli-definitions.ts"],"names":[],"mappings":";;;AAQa,QAAA,YAAY,GAAe;IACtC;QACE,KAAK,EAAE,qBAAqB;QAC5B,WAAW,EAAE,gDAAgD;KAC9D;IACD;QACE,KAAK,EAAE,qBAAqB;QAC5B,WAAW,EAAE,wBAAwB;QACrC,eAAe,EAAE,oCAAoC;KACtD;CACF,CAAA;AAEY,QAAA,UAAU,GAAe;IACpC;QACE,KAAK,EAAE,4BAA4B;QACnC,WAAW,EAAE,kCAAkC;QAC/C,WAAW,EAAE;YACX,6DAA6D;YAC7D,8BAA8B;YAC9B,2DAA2D;SAC5D;KACF;IACD;QACE,KAAK,EAAE,QAAQ;QACf,WAAW,EACT,+DAA+D;QACjE,eAAe,EAAE,qCAAqC;KACvD;IACD;QACE,KAAK,EAAE,iBAAiB;QACxB,WAAW,EACT,yMAAyM;QAC3M,eAAe,EAAE,sDAAsD;QACvE,MAAM,EAAE,IAAI;KACb;IACD;QACE,KAAK,EAAE,QAAQ;QACf,WAAW,EAAE,uCAAuC;QACpD,eAAe,EAAE,gDAAgD;QACjE,MAAM,EAAE,KAAK;KACd;IACD;QACE,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,gDAAgD;QAC7D,eAAe,EACb,2DAA2D;QAC7D,MAAM,EAAE,KAAK;KACd;IACD;QACE,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,uCAAuC;QACpD,eAAe,EAAE,uCAAuC;QACxD,MAAM,EAAE,KAAK;KACd;IACD;QACE,KAAK,EAAE,gBAAgB;QACvB,WAAW,EAAE,mDAAmD;QAChE,MAAM,EAAE,IAAI;KACb;IACD;QACE,KAAK,EAAE,cAAc;QACrB,WAAW,EAAE,sDAAsD;QACnE,eAAe,EAAE,sDAAsD;QACvE,MAAM,EAAE,IAAI;KACb;CACF,CAAA"}
|
|
@@ -15,4 +15,5 @@ export declare function handleUndo(client: Client, rl: ReadlineInterface): Promi
|
|
|
15
15
|
export declare function handleRedo(client: Client, rl: ReadlineInterface): Promise<string>;
|
|
16
16
|
export declare function handleRestoreCheckpoint(id: number, client: Client, rl: ReadlineInterface): Promise<string>;
|
|
17
17
|
export declare function handleClearCheckpoints(): void;
|
|
18
|
+
export declare function waitForPreviousCheckpoint(): Promise<void>;
|
|
18
19
|
export declare function saveCheckpoint(userInput: string, client: Client, readyPromise: Promise<any>, saveWithNoChanges?: boolean): Promise<void>;
|
|
@@ -8,6 +8,7 @@ exports.handleUndo = handleUndo;
|
|
|
8
8
|
exports.handleRedo = handleRedo;
|
|
9
9
|
exports.handleRestoreCheckpoint = handleRestoreCheckpoint;
|
|
10
10
|
exports.handleClearCheckpoints = handleClearCheckpoints;
|
|
11
|
+
exports.waitForPreviousCheckpoint = waitForPreviousCheckpoint;
|
|
11
12
|
exports.saveCheckpoint = saveCheckpoint;
|
|
12
13
|
const picocolors_1 = require("picocolors");
|
|
13
14
|
const checkpoint_manager_1 = require("../checkpoints/checkpoint-manager");
|
|
@@ -184,13 +185,7 @@ function handleClearCheckpoints() {
|
|
|
184
185
|
checkpoint_manager_1.checkpointManager.clearCheckpoints();
|
|
185
186
|
console.log('Cleared all checkpoints.');
|
|
186
187
|
}
|
|
187
|
-
async function
|
|
188
|
-
if (checkpoint_manager_1.checkpointManager.disabledReason !== null) {
|
|
189
|
-
return;
|
|
190
|
-
}
|
|
191
|
-
spinner_1.Spinner.get().start();
|
|
192
|
-
await readyPromise;
|
|
193
|
-
spinner_1.Spinner.get().stop();
|
|
188
|
+
async function waitForPreviousCheckpoint() {
|
|
194
189
|
try {
|
|
195
190
|
// Make sure the previous checkpoint is done
|
|
196
191
|
await checkpoint_manager_1.checkpointManager.getLatestCheckpoint().fileStateIdPromise;
|
|
@@ -198,6 +193,15 @@ async function saveCheckpoint(userInput, client, readyPromise, saveWithNoChanges
|
|
|
198
193
|
catch (error) {
|
|
199
194
|
// No latest checkpoint available, previous checkpoint is guaranteed to be done.
|
|
200
195
|
}
|
|
196
|
+
}
|
|
197
|
+
async function saveCheckpoint(userInput, client, readyPromise, saveWithNoChanges = false) {
|
|
198
|
+
if (checkpoint_manager_1.checkpointManager.disabledReason !== null) {
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
spinner_1.Spinner.get().start();
|
|
202
|
+
await readyPromise;
|
|
203
|
+
spinner_1.Spinner.get().stop();
|
|
204
|
+
await waitForPreviousCheckpoint();
|
|
201
205
|
// Save the current agent state
|
|
202
206
|
try {
|
|
203
207
|
const { checkpoint, created } = await checkpoint_manager_1.checkpointManager.addCheckpoint(client.agentState, client.lastToolResults, userInput, saveWithNoChanges);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../src/cli-handlers/checkpoint.ts"],"names":[],"mappings":";;;AAyBA,sDASC;AAED,kDAoCC;AAED,0CAEC;AAED,gCA0CC;AAED,gCA0CC;AAED,0DAkEC;AAED,wDAGC;AAED,
|
|
1
|
+
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../src/cli-handlers/checkpoint.ts"],"names":[],"mappings":"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"}
|
package/dist/client.js
CHANGED
|
@@ -26,6 +26,7 @@ const browser_runner_1 = require("./browser-runner");
|
|
|
26
26
|
const chat_storage_1 = require("./chat-storage");
|
|
27
27
|
const checkpoint_manager_1 = require("./checkpoints/checkpoint-manager");
|
|
28
28
|
const cli_1 = require("./cli");
|
|
29
|
+
const checkpoint_1 = require("./cli-handlers/checkpoint");
|
|
29
30
|
const config_1 = require("./config");
|
|
30
31
|
const credentials_1 = require("./credentials");
|
|
31
32
|
const fingerprint_1 = require("./fingerprint");
|
|
@@ -389,7 +390,7 @@ class Client {
|
|
|
389
390
|
let shouldRequestLogin = true;
|
|
390
391
|
cli_1.CLI.getInstance().rl.once('line', () => {
|
|
391
392
|
if (shouldRequestLogin) {
|
|
392
|
-
(0, child_process_1.spawn)(
|
|
393
|
+
(0, child_process_1.spawn)(process.platform === 'win32' ? 'start' : 'open', [loginUrl]);
|
|
393
394
|
console.log("Opened a browser window to log you in! If it doesn't open automatically, you can click this link:");
|
|
394
395
|
console.log();
|
|
395
396
|
console.log((0, picocolors_1.blue)((0, picocolors_1.bold)((0, picocolors_1.underline)(loginUrl))));
|
|
@@ -797,22 +798,24 @@ class Client {
|
|
|
797
798
|
if (toolCall.name === 'write_file' ||
|
|
798
799
|
toolCall.name === 'str_replace' ||
|
|
799
800
|
toolCall.name === 'create_plan') {
|
|
801
|
+
await (0, checkpoint_1.waitForPreviousCheckpoint)();
|
|
800
802
|
// Save lastChanges for `diff` command
|
|
801
803
|
this.lastChanges.push(actions_1.FileChangeSchema.parse(toolCall.parameters));
|
|
802
804
|
this.hadFileChanges = true;
|
|
803
805
|
// Track the changed file path
|
|
804
806
|
this.filesChangedForHook.push(toolCall.parameters.path);
|
|
805
807
|
}
|
|
806
|
-
if (toolCall.name === 'run_terminal_command'
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
toolCall.parameters.mode === 'assistant' &&
|
|
814
|
-
|
|
815
|
-
|
|
808
|
+
if (toolCall.name === 'run_terminal_command') {
|
|
809
|
+
await (0, checkpoint_1.waitForPreviousCheckpoint)();
|
|
810
|
+
if (toolCall.parameters.mode === 'user') {
|
|
811
|
+
// Special case: when terminal command is run as a user command, then no need to reprompt assistant.
|
|
812
|
+
this.responseComplete = true;
|
|
813
|
+
isComplete = true;
|
|
814
|
+
}
|
|
815
|
+
if (toolCall.parameters.mode === 'assistant' &&
|
|
816
|
+
toolCall.parameters.process_type === 'BACKGROUND') {
|
|
817
|
+
this.oneTimeFlags[constants_2.SHOULD_ASK_CONFIG] = true;
|
|
818
|
+
}
|
|
816
819
|
}
|
|
817
820
|
const toolResult = await (0, tool_handlers_1.handleToolCall)(toolCall);
|
|
818
821
|
toolResults.push(toolResult);
|