takt 0.35.0 → 0.35.2
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/README.md +2 -2
- package/builtins/en/facets/instructions/write-tests-first.md +4 -34
- package/builtins/en/facets/output-contracts/test-report.md +20 -0
- package/builtins/en/workflows/backend-cqrs.yaml +2 -4
- package/builtins/en/workflows/backend.yaml +2 -4
- package/builtins/en/workflows/default.yaml +2 -4
- package/builtins/en/workflows/dual.yaml +2 -4
- package/builtins/en/workflows/frontend.yaml +2 -4
- package/builtins/en/workflows/takt-default.yaml +2 -4
- package/builtins/ja/facets/instructions/write-tests-first.md +4 -34
- package/builtins/ja/facets/output-contracts/test-report.md +20 -0
- package/builtins/ja/workflows/backend-cqrs.yaml +2 -4
- package/builtins/ja/workflows/backend.yaml +2 -4
- package/builtins/ja/workflows/default.yaml +2 -4
- package/builtins/ja/workflows/dual.yaml +2 -4
- package/builtins/ja/workflows/frontend.yaml +2 -4
- package/builtins/ja/workflows/takt-default.yaml +2 -4
- package/dist/app/cli/immediateSigintExit.d.ts +17 -0
- package/dist/app/cli/immediateSigintExit.d.ts.map +1 -0
- package/dist/app/cli/immediateSigintExit.js +33 -0
- package/dist/app/cli/immediateSigintExit.js.map +1 -0
- package/dist/app/cli/index.d.ts.map +1 -1
- package/dist/app/cli/index.js +2 -0
- package/dist/app/cli/index.js.map +1 -1
- package/dist/core/piece/run/run-meta.d.ts +19 -0
- package/dist/core/piece/run/run-meta.d.ts.map +1 -0
- package/dist/core/piece/run/run-meta.js +42 -0
- package/dist/core/piece/run/run-meta.js.map +1 -0
- package/dist/features/interactive/runSessionReader.d.ts.map +1 -1
- package/dist/features/interactive/runSessionReader.js +4 -21
- package/dist/features/interactive/runSessionReader.js.map +1 -1
- package/dist/features/pipeline/steps.d.ts.map +1 -1
- package/dist/features/pipeline/steps.js +15 -7
- package/dist/features/pipeline/steps.js.map +1 -1
- package/dist/features/tasks/execute/outputFns.d.ts.map +1 -1
- package/dist/features/tasks/execute/outputFns.js +16 -1
- package/dist/features/tasks/execute/outputFns.js.map +1 -1
- package/dist/features/tasks/execute/pieceExecution.d.ts.map +1 -1
- package/dist/features/tasks/execute/pieceExecution.js +7 -1
- package/dist/features/tasks/execute/pieceExecution.js.map +1 -1
- package/dist/features/tasks/execute/resolveTask.d.ts +1 -1
- package/dist/features/tasks/execute/resolveTask.d.ts.map +1 -1
- package/dist/features/tasks/execute/resolveTask.js +6 -4
- package/dist/features/tasks/execute/resolveTask.js.map +1 -1
- package/dist/features/tasks/execute/runAllTasks.d.ts.map +1 -1
- package/dist/features/tasks/execute/runAllTasks.js +5 -0
- package/dist/features/tasks/execute/runAllTasks.js.map +1 -1
- package/dist/features/tasks/execute/runMeta.d.ts +1 -0
- package/dist/features/tasks/execute/runMeta.d.ts.map +1 -1
- package/dist/features/tasks/execute/runMeta.js +5 -0
- package/dist/features/tasks/execute/runMeta.js.map +1 -1
- package/dist/features/tasks/execute/selectAndExecute.d.ts.map +1 -1
- package/dist/features/tasks/execute/selectAndExecute.js +5 -0
- package/dist/features/tasks/execute/selectAndExecute.js.map +1 -1
- package/dist/features/tasks/execute/taskExecution.d.ts.map +1 -1
- package/dist/features/tasks/execute/taskExecution.js +12 -5
- package/dist/features/tasks/execute/taskExecution.js.map +1 -1
- package/dist/features/tasks/list/index.d.ts.map +1 -1
- package/dist/features/tasks/list/index.js +13 -7
- package/dist/features/tasks/list/index.js.map +1 -1
- package/dist/features/tasks/list/taskForceFailActions.d.ts +3 -0
- package/dist/features/tasks/list/taskForceFailActions.d.ts.map +1 -0
- package/dist/features/tasks/list/taskForceFailActions.js +67 -0
- package/dist/features/tasks/list/taskForceFailActions.js.map +1 -0
- package/dist/infra/claude-headless/headless-spawn.d.ts.map +1 -1
- package/dist/infra/claude-headless/headless-spawn.js +9 -2
- package/dist/infra/claude-headless/headless-spawn.js.map +1 -1
- package/dist/infra/claude-headless/stream-json-lines.d.ts +1 -0
- package/dist/infra/claude-headless/stream-json-lines.d.ts.map +1 -1
- package/dist/infra/claude-headless/stream-json-lines.js +27 -0
- package/dist/infra/claude-headless/stream-json-lines.js.map +1 -1
- package/dist/infra/providers/codex.d.ts.map +1 -1
- package/dist/infra/providers/codex.js +0 -27
- package/dist/infra/providers/codex.js.map +1 -1
- package/dist/infra/task/clone-base-branch.d.ts +7 -0
- package/dist/infra/task/clone-base-branch.d.ts.map +1 -1
- package/dist/infra/task/clone-base-branch.js +48 -0
- package/dist/infra/task/clone-base-branch.js.map +1 -1
- package/dist/infra/task/clone-exec.d.ts +5 -0
- package/dist/infra/task/clone-exec.d.ts.map +1 -1
- package/dist/infra/task/clone-exec.js +138 -1
- package/dist/infra/task/clone-exec.js.map +1 -1
- package/dist/infra/task/clone.d.ts +2 -0
- package/dist/infra/task/clone.d.ts.map +1 -1
- package/dist/infra/task/clone.js +39 -2
- package/dist/infra/task/clone.js.map +1 -1
- package/dist/infra/task/index.d.ts +1 -1
- package/dist/infra/task/index.d.ts.map +1 -1
- package/dist/infra/task/index.js +1 -1
- package/dist/infra/task/index.js.map +1 -1
- package/dist/infra/task/mapper.d.ts.map +1 -1
- package/dist/infra/task/mapper.js +3 -0
- package/dist/infra/task/mapper.js.map +1 -1
- package/dist/infra/task/runner.d.ts +7 -1
- package/dist/infra/task/runner.d.ts.map +1 -1
- package/dist/infra/task/runner.js +6 -0
- package/dist/infra/task/runner.js.map +1 -1
- package/dist/infra/task/schema.d.ts +6 -0
- package/dist/infra/task/schema.d.ts.map +1 -1
- package/dist/infra/task/schema.js +1 -0
- package/dist/infra/task/schema.js.map +1 -1
- package/dist/infra/task/taskLifecycleService.d.ts +7 -1
- package/dist/infra/task/taskLifecycleService.d.ts.map +1 -1
- package/dist/infra/task/taskLifecycleService.js +45 -0
- package/dist/infra/task/taskLifecycleService.js.map +1 -1
- package/dist/infra/task/types.d.ts +3 -0
- package/dist/infra/task/types.d.ts.map +1 -1
- package/dist/shared/ui/Progress.d.ts.map +1 -1
- package/dist/shared/ui/Progress.js +26 -7
- package/dist/shared/ui/Progress.js.map +1 -1
- package/dist/shared/ui/StatusLine.d.ts +24 -0
- package/dist/shared/ui/StatusLine.d.ts.map +1 -0
- package/dist/shared/ui/StatusLine.js +81 -0
- package/dist/shared/ui/StatusLine.js.map +1 -0
- package/dist/shared/ui/StreamDisplay.d.ts.map +1 -1
- package/dist/shared/ui/StreamDisplay.js.map +1 -1
- package/dist/shared/ui/TaskPrefixWriter.d.ts +4 -2
- package/dist/shared/ui/TaskPrefixWriter.d.ts.map +1 -1
- package/dist/shared/ui/TaskPrefixWriter.js +8 -4
- package/dist/shared/ui/TaskPrefixWriter.js.map +1 -1
- package/dist/shared/ui/index.d.ts +1 -0
- package/dist/shared/ui/index.d.ts.map +1 -1
- package/dist/shared/ui/index.js +1 -0
- package/dist/shared/ui/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,6 +3,7 @@ import { selectOption } from '../../../shared/prompt/index.js';
|
|
|
3
3
|
import { info, header, blankLine } from '../../../shared/ui/index.js';
|
|
4
4
|
import { showFullDiff, showDiffAndPromptActionForTask, tryMergeBranch, mergeBranch, instructBranch, syncBranchWithRoot, pullFromRemote, } from './taskActions.js';
|
|
5
5
|
import { deleteTaskByKind, deleteAllTasks } from './taskDeleteActions.js';
|
|
6
|
+
import { forceFailRunningTask } from './taskForceFailActions.js';
|
|
6
7
|
import { retryFailedTask } from './taskRetryActions.js';
|
|
7
8
|
import { listTasksNonInteractive } from './listNonInteractive.js';
|
|
8
9
|
import { formatTaskStatusLabel, formatShortDate } from './taskStatusLabel.js';
|
|
@@ -32,6 +33,15 @@ async function showPendingTaskAndPromptAction(task) {
|
|
|
32
33
|
blankLine();
|
|
33
34
|
return await selectOption(`Action for ${task.name}:`, [{ label: 'Delete', value: 'delete', description: 'Remove this task permanently' }]);
|
|
34
35
|
}
|
|
36
|
+
async function showRunningTaskAndPromptAction(task) {
|
|
37
|
+
header(formatTaskStatusLabel(task));
|
|
38
|
+
info(` Created: ${task.createdAt}`);
|
|
39
|
+
if (task.content) {
|
|
40
|
+
info(` ${task.content}`);
|
|
41
|
+
}
|
|
42
|
+
blankLine();
|
|
43
|
+
return await selectOption(`Action for ${task.name}:`, [{ label: 'Mark as failed', value: 'force_fail', description: 'Mark stuck running task as failed' }]);
|
|
44
|
+
}
|
|
35
45
|
async function showFailedTaskAndPromptAction(task) {
|
|
36
46
|
header(formatTaskStatusLabel(task));
|
|
37
47
|
info(` Created: ${task.createdAt}`);
|
|
@@ -113,14 +123,10 @@ export async function listTasks(cwd, options, nonInteractive) {
|
|
|
113
123
|
const task = tasks[idx];
|
|
114
124
|
if (!task)
|
|
115
125
|
continue;
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
info(` ${task.content}`);
|
|
126
|
+
const taskAction = await showRunningTaskAndPromptAction(task);
|
|
127
|
+
if (taskAction === 'force_fail') {
|
|
128
|
+
await forceFailRunningTask(task, cwd);
|
|
120
129
|
}
|
|
121
|
-
blankLine();
|
|
122
|
-
info('Running task is read-only.');
|
|
123
|
-
blankLine();
|
|
124
130
|
}
|
|
125
131
|
else if (type === 'completed') {
|
|
126
132
|
const task = tasks[idx];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"taskForceFailActions.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskForceFailActions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAgDjE,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CA2BlB"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { resolve } from 'node:path';
|
|
2
|
+
import { findRunningStepByRunSlug } from '../../../core/piece/run/run-meta.js';
|
|
3
|
+
import { resolveCloneBaseDir } from '../../../infra/task/clone.js';
|
|
4
|
+
import { TaskRunner, isStaleRunningTask } from '../../../infra/task/index.js';
|
|
5
|
+
import { confirm } from '../../../shared/prompt/index.js';
|
|
6
|
+
import { success, error as logError } from '../../../shared/ui/index.js';
|
|
7
|
+
import { createLogger, getErrorMessage, isPathInside } from '../../../shared/utils/index.js';
|
|
8
|
+
const log = createLogger('list-tasks');
|
|
9
|
+
const FORCE_FAIL_ERROR = 'Manually marked as failed';
|
|
10
|
+
function resolveSafeWorktreePath(projectDir, worktreePath) {
|
|
11
|
+
if (!worktreePath) {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
const cloneBaseDir = resolveCloneBaseDir(projectDir);
|
|
15
|
+
const fallbackCloneBaseDir = resolve(projectDir, '.takt', 'worktrees');
|
|
16
|
+
if (isPathInside(cloneBaseDir, worktreePath) || isPathInside(fallbackCloneBaseDir, worktreePath)) {
|
|
17
|
+
return worktreePath;
|
|
18
|
+
}
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
function resolveCurrentStep(projectDir, task) {
|
|
22
|
+
const runSlug = task.runSlug;
|
|
23
|
+
if (!runSlug) {
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
const worktreePath = resolveSafeWorktreePath(projectDir, task.worktreePath);
|
|
27
|
+
if (worktreePath) {
|
|
28
|
+
const worktreeStep = findRunningStepByRunSlug(worktreePath, runSlug);
|
|
29
|
+
if (worktreeStep) {
|
|
30
|
+
return worktreeStep;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return findRunningStepByRunSlug(projectDir, runSlug);
|
|
34
|
+
}
|
|
35
|
+
function buildConfirmationMessage(task) {
|
|
36
|
+
if (isStaleRunningTask(task.ownerPid)) {
|
|
37
|
+
return `Mark running task "${task.name}" as failed?`;
|
|
38
|
+
}
|
|
39
|
+
return `Process ${task.ownerPid} may still be running. Mark "${task.name}" as failed anyway?`;
|
|
40
|
+
}
|
|
41
|
+
export async function forceFailRunningTask(task, projectDir) {
|
|
42
|
+
if (task.kind !== 'running') {
|
|
43
|
+
throw new Error(`forceFailRunningTask requires running task. received: ${task.kind}`);
|
|
44
|
+
}
|
|
45
|
+
const confirmed = await confirm(buildConfirmationMessage(task), false);
|
|
46
|
+
if (!confirmed) {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
try {
|
|
50
|
+
const movement = resolveCurrentStep(projectDir, task);
|
|
51
|
+
const runner = new TaskRunner(projectDir);
|
|
52
|
+
runner.forceFailRunningTask(task.name, {
|
|
53
|
+
movement,
|
|
54
|
+
error: FORCE_FAIL_ERROR,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
catch (err) {
|
|
58
|
+
const message = getErrorMessage(err);
|
|
59
|
+
logError(`Failed to mark running task "${task.name}" as failed: ${message}`);
|
|
60
|
+
log.error('Failed to force-fail running task', { name: task.name, filePath: task.filePath, error: message });
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
63
|
+
success(`Marked running task as failed: ${task.name}`);
|
|
64
|
+
log.info('Force-failed running task', { name: task.name, filePath: task.filePath });
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=taskForceFailActions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"taskForceFailActions.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskForceFailActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless-spawn.d.ts","sourceRoot":"","sources":["../../../src/infra/claude-headless/headless-spawn.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAI5D,eAAO,MAAM,wBAAwB,iCAAiC,CAAC;AAWvE,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG;IAC9B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CAChC,CAAC;AAuBF,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"headless-spawn.d.ts","sourceRoot":"","sources":["../../../src/infra/claude-headless/headless-spawn.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAI5D,eAAO,MAAM,wBAAwB,iCAAiC,CAAC;AAWvE,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG;IAC9B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CAChC,CAAC;AAuBF,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAqM7C"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
-
import { tryExtractTextFromStreamJsonLine } from './stream-json-lines.js';
|
|
2
|
+
import { tryExtractTextFromStreamJsonLine, tryExtractThinkingFromStreamJsonLine } from './stream-json-lines.js';
|
|
3
3
|
const HEADLESS_STREAM_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
|
|
4
4
|
const HEADLESS_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
|
|
5
5
|
export const HEADLESS_ABORTED_MESSAGE = 'Claude CLI execution aborted';
|
|
@@ -118,9 +118,16 @@ export function runHeadlessCli(args, options) {
|
|
|
118
118
|
const flushLines = (final = false) => {
|
|
119
119
|
const parts = lineBuffer.split('\n');
|
|
120
120
|
lineBuffer = final ? '' : (parts.pop() ?? '');
|
|
121
|
+
if (!options.onStream)
|
|
122
|
+
return;
|
|
121
123
|
for (const line of parts) {
|
|
124
|
+
const thinking = tryExtractThinkingFromStreamJsonLine(line);
|
|
125
|
+
if (thinking) {
|
|
126
|
+
options.onStream({ type: 'thinking', data: { thinking } });
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
122
129
|
const text = tryExtractTextFromStreamJsonLine(line);
|
|
123
|
-
if (text
|
|
130
|
+
if (text) {
|
|
124
131
|
options.onStream({ type: 'text', data: { text } });
|
|
125
132
|
}
|
|
126
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless-spawn.js","sourceRoot":"","sources":["../../../src/infra/claude-headless/headless-spawn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"headless-spawn.js","sourceRoot":"","sources":["../../../src/infra/claude-headless/headless-spawn.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare function tryExtractTextFromStreamJsonLine(line: string): string | undefined;
|
|
2
|
+
export declare function tryExtractThinkingFromStreamJsonLine(line: string): string | undefined;
|
|
2
3
|
export declare function tryExtractSessionIdFromStreamJsonLine(line: string): string | undefined;
|
|
3
4
|
export interface StreamJsonStdoutResult {
|
|
4
5
|
content: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-json-lines.d.ts","sourceRoot":"","sources":["../../../src/infra/claude-headless/stream-json-lines.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stream-json-lines.d.ts","sourceRoot":"","sources":["../../../src/infra/claude-headless/stream-json-lines.ts"],"names":[],"mappings":"AA8HA,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGjF;AAED,wBAAgB,oCAAoC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGrF;AAED,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMtF;AAiCD,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,sBAAsB,CA0ChF;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW7E"}
|
|
@@ -82,10 +82,37 @@ function extractSessionIdFromEvent(parsed) {
|
|
|
82
82
|
const result = toRecord(root.result);
|
|
83
83
|
return pickString(result, ['session_id', 'sessionId', 'sessionID', 'thread_id', 'threadId']);
|
|
84
84
|
}
|
|
85
|
+
function unwrapStreamEvent(root) {
|
|
86
|
+
if (root.type === 'stream_event') {
|
|
87
|
+
return toRecord(root.event);
|
|
88
|
+
}
|
|
89
|
+
return root;
|
|
90
|
+
}
|
|
91
|
+
function extractStreamingThinkingFromEvent(parsed) {
|
|
92
|
+
const root = toRecord(parsed);
|
|
93
|
+
if (!root) {
|
|
94
|
+
return undefined;
|
|
95
|
+
}
|
|
96
|
+
const event = unwrapStreamEvent(root);
|
|
97
|
+
if (!event) {
|
|
98
|
+
return undefined;
|
|
99
|
+
}
|
|
100
|
+
if (event.type === 'content_block_delta') {
|
|
101
|
+
const delta = toRecord(event.delta);
|
|
102
|
+
if (delta?.type === 'thinking_delta' && typeof delta.thinking === 'string' && delta.thinking.length > 0) {
|
|
103
|
+
return delta.thinking;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
return undefined;
|
|
107
|
+
}
|
|
85
108
|
export function tryExtractTextFromStreamJsonLine(line) {
|
|
86
109
|
const parsed = parseStreamJsonLine(line);
|
|
87
110
|
return parsed ? extractStreamingTextFromEvent(parsed) : undefined;
|
|
88
111
|
}
|
|
112
|
+
export function tryExtractThinkingFromStreamJsonLine(line) {
|
|
113
|
+
const parsed = parseStreamJsonLine(line);
|
|
114
|
+
return parsed ? extractStreamingThinkingFromEvent(parsed) : undefined;
|
|
115
|
+
}
|
|
89
116
|
export function tryExtractSessionIdFromStreamJsonLine(line) {
|
|
90
117
|
const parsed = parseStreamJsonLine(line);
|
|
91
118
|
if (!parsed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-json-lines.js","sourceRoot":"","sources":["../../../src/infra/claude-headless/stream-json-lines.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stream-json-lines.js","sourceRoot":"","sources":["../../../src/infra/claude-headless/stream-json-lines.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/infra/providers/codex.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/infra/providers/codex.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAuB,MAAM,YAAY,CAAC;AAkB3F,qDAAqD;AACrD,qBAAa,aAAc,YAAW,QAAQ;IAC5C,QAAQ,CAAC,wBAAwB,QAAQ;IAEzC,KAAK,CAAC,MAAM,EAAE,UAAU,GAAG,aAAa;CAgBzC"}
|
|
@@ -1,23 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Codex provider implementation
|
|
3
3
|
*/
|
|
4
|
-
import { execFileSync } from 'node:child_process';
|
|
5
4
|
import { callCodex, callCodexCustom } from '../codex/index.js';
|
|
6
5
|
import { resolveOpenaiApiKey, resolveCodexCliPath } from '../config/index.js';
|
|
7
|
-
const NOT_GIT_REPO_MESSAGE = 'Codex をご利用の場合 Git 管理下のディレクトリでのみ動作します。';
|
|
8
|
-
function isInsideGitRepo(cwd) {
|
|
9
|
-
try {
|
|
10
|
-
const result = execFileSync('git', ['rev-parse', '--is-inside-work-tree'], {
|
|
11
|
-
cwd,
|
|
12
|
-
encoding: 'utf-8',
|
|
13
|
-
stdio: 'pipe',
|
|
14
|
-
}).trim();
|
|
15
|
-
return result === 'true';
|
|
16
|
-
}
|
|
17
|
-
catch {
|
|
18
|
-
return false;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
6
|
function toCodexOptions(options) {
|
|
22
7
|
return {
|
|
23
8
|
cwd: options.cwd,
|
|
@@ -33,14 +18,6 @@ function toCodexOptions(options) {
|
|
|
33
18
|
outputSchema: options.outputSchema,
|
|
34
19
|
};
|
|
35
20
|
}
|
|
36
|
-
function errorResponse(agentName) {
|
|
37
|
-
return {
|
|
38
|
-
persona: agentName,
|
|
39
|
-
status: 'error',
|
|
40
|
-
content: NOT_GIT_REPO_MESSAGE,
|
|
41
|
-
timestamp: new Date(),
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
21
|
/** Codex provider — delegates to OpenAI Codex SDK */
|
|
45
22
|
export class CodexProvider {
|
|
46
23
|
supportsStructuredOutput = true;
|
|
@@ -49,16 +26,12 @@ export class CodexProvider {
|
|
|
49
26
|
if (systemPrompt) {
|
|
50
27
|
return {
|
|
51
28
|
call: async (prompt, options) => {
|
|
52
|
-
if (!isInsideGitRepo(options.cwd))
|
|
53
|
-
return errorResponse(name);
|
|
54
29
|
return callCodexCustom(name, prompt, systemPrompt, toCodexOptions(options));
|
|
55
30
|
},
|
|
56
31
|
};
|
|
57
32
|
}
|
|
58
33
|
return {
|
|
59
34
|
call: async (prompt, options) => {
|
|
60
|
-
if (!isInsideGitRepo(options.cwd))
|
|
61
|
-
return errorResponse(name);
|
|
62
35
|
return callCodex(name, prompt, toCodexOptions(options));
|
|
63
36
|
},
|
|
64
37
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/infra/providers/codex.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/infra/providers/codex.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,eAAe,EAAyB,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9E,SAAS,cAAc,CAAC,OAA4B;IAClD,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,KAAK,EAAE,eAAe;QAChE,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,aAAa,EAAE,OAAO,CAAC,eAAe,EAAE,KAAK,EAAE,aAAa;QAC5D,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,mBAAmB,EAAE;QAC3D,iBAAiB,EAAE,mBAAmB,EAAE;QACxC,YAAY,EAAE,OAAO,CAAC,YAAY;KACnC,CAAC;AACJ,CAAC;AAED,qDAAqD;AACrD,MAAM,OAAO,aAAa;IACf,wBAAwB,GAAG,IAAI,CAAC;IAEzC,KAAK,CAAC,MAAkB;QACtB,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QACtC,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO;gBACL,IAAI,EAAE,KAAK,EAAE,MAAc,EAAE,OAA4B,EAA0B,EAAE;oBACnF,OAAO,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC9E,CAAC;aACF,CAAC;QACJ,CAAC;QAED,OAAO;YACL,IAAI,EAAE,KAAK,EAAE,MAAc,EAAE,OAA4B,EAA0B,EAAE;gBACnF,OAAO,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1D,CAAC;SACF,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
export declare function localBranchExists(projectDir: string, branch: string): boolean;
|
|
2
2
|
export declare function remoteBranchExists(projectDir: string, branch: string): boolean;
|
|
3
3
|
export declare function branchExists(projectDir: string, branch: string): boolean;
|
|
4
|
+
export declare function localBranchExistsAbortable(projectDir: string, branch: string, abortSignal?: AbortSignal): Promise<boolean>;
|
|
5
|
+
export declare function remoteBranchExistsAbortable(projectDir: string, branch: string, abortSignal?: AbortSignal): Promise<boolean>;
|
|
6
|
+
export declare function branchExistsAbortable(projectDir: string, branch: string, abortSignal?: AbortSignal): Promise<boolean>;
|
|
4
7
|
export declare function resolveBaseBranch(projectDir: string, explicitBaseBranch?: string): {
|
|
5
8
|
branch: string;
|
|
6
9
|
fetchedCommit?: string;
|
|
7
10
|
};
|
|
11
|
+
export declare function resolveBaseBranchAbortable(projectDir: string, explicitBaseBranch?: string, abortSignal?: AbortSignal): Promise<{
|
|
12
|
+
branch: string;
|
|
13
|
+
fetchedCommit?: string;
|
|
14
|
+
}>;
|
|
8
15
|
//# sourceMappingURL=clone-base-branch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone-base-branch.d.ts","sourceRoot":"","sources":["../../../src/infra/task/clone-base-branch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"clone-base-branch.d.ts","sourceRoot":"","sources":["../../../src/infra/task/clone-base-branch.ts"],"names":[],"mappings":"AAQA,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAU7E;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAU9E;AAED,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAExE;AAED,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,OAAO,CAAC,CAOlB;AAED,wBAAsB,2BAA2B,CAC/C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,OAAO,CAAC,CAOlB;AAED,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,OAAO,CAAC,CAKlB;AAwBD,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,MAAM,GAC1B;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAmC5C;AAED,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA6BrD"}
|
|
@@ -2,6 +2,7 @@ import { execFileSync } from 'node:child_process';
|
|
|
2
2
|
import { createLogger } from '../../shared/utils/index.js';
|
|
3
3
|
import { resolveConfigValue } from '../config/index.js';
|
|
4
4
|
import { detectDefaultBranch } from './branchList.js';
|
|
5
|
+
import { runGitCommandAbortable } from './clone-exec.js';
|
|
5
6
|
const log = createLogger('clone');
|
|
6
7
|
export function localBranchExists(projectDir, branch) {
|
|
7
8
|
try {
|
|
@@ -30,6 +31,28 @@ export function remoteBranchExists(projectDir, branch) {
|
|
|
30
31
|
export function branchExists(projectDir, branch) {
|
|
31
32
|
return localBranchExists(projectDir, branch) || remoteBranchExists(projectDir, branch);
|
|
32
33
|
}
|
|
34
|
+
export async function localBranchExistsAbortable(projectDir, branch, abortSignal) {
|
|
35
|
+
try {
|
|
36
|
+
await runGitCommandAbortable(projectDir, ['show-ref', '--verify', '--quiet', `refs/heads/${branch}`], abortSignal);
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
export async function remoteBranchExistsAbortable(projectDir, branch, abortSignal) {
|
|
44
|
+
try {
|
|
45
|
+
await runGitCommandAbortable(projectDir, ['show-ref', '--verify', '--quiet', `refs/remotes/origin/${branch}`], abortSignal);
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
catch {
|
|
49
|
+
return false;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
export async function branchExistsAbortable(projectDir, branch, abortSignal) {
|
|
53
|
+
return (await localBranchExistsAbortable(projectDir, branch, abortSignal)
|
|
54
|
+
|| await remoteBranchExistsAbortable(projectDir, branch, abortSignal));
|
|
55
|
+
}
|
|
33
56
|
function resolveConfiguredBaseBranch(projectDir, explicitBaseBranch) {
|
|
34
57
|
if (explicitBaseBranch !== undefined) {
|
|
35
58
|
const normalized = explicitBaseBranch.trim();
|
|
@@ -78,4 +101,29 @@ export function resolveBaseBranch(projectDir, explicitBaseBranch) {
|
|
|
78
101
|
return { branch: baseBranch };
|
|
79
102
|
}
|
|
80
103
|
}
|
|
104
|
+
export async function resolveBaseBranchAbortable(projectDir, explicitBaseBranch, abortSignal) {
|
|
105
|
+
const configBaseBranch = resolveConfiguredBaseBranch(projectDir, explicitBaseBranch);
|
|
106
|
+
const autoFetch = resolveConfigValue(projectDir, 'autoFetch');
|
|
107
|
+
const baseBranch = configBaseBranch ?? detectDefaultBranch(projectDir);
|
|
108
|
+
if (explicitBaseBranch !== undefined) {
|
|
109
|
+
assertValidBranchRef(projectDir, baseBranch);
|
|
110
|
+
}
|
|
111
|
+
if (explicitBaseBranch !== undefined && !await branchExistsAbortable(projectDir, baseBranch, abortSignal)) {
|
|
112
|
+
throw new Error(`Base branch does not exist: ${baseBranch}`);
|
|
113
|
+
}
|
|
114
|
+
if (!autoFetch) {
|
|
115
|
+
return { branch: baseBranch };
|
|
116
|
+
}
|
|
117
|
+
try {
|
|
118
|
+
await runGitCommandAbortable(projectDir, ['fetch', 'origin'], abortSignal);
|
|
119
|
+
const { stdout } = await runGitCommandAbortable(projectDir, ['rev-parse', `origin/${baseBranch}`], abortSignal);
|
|
120
|
+
const fetchedCommit = stdout.trim();
|
|
121
|
+
log.info('Fetched remote and resolved base branch', { baseBranch, fetchedCommit });
|
|
122
|
+
return { branch: baseBranch, fetchedCommit };
|
|
123
|
+
}
|
|
124
|
+
catch (err) {
|
|
125
|
+
log.info('Failed to fetch from remote, continuing with local state', { baseBranch, error: String(err) });
|
|
126
|
+
return { branch: baseBranch };
|
|
127
|
+
}
|
|
128
|
+
}
|
|
81
129
|
//# sourceMappingURL=clone-base-branch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone-base-branch.js","sourceRoot":"","sources":["../../../src/infra/task/clone-base-branch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"clone-base-branch.js","sourceRoot":"","sources":["../../../src/infra/task/clone-base-branch.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,4 +4,9 @@ export declare function resolveCloneSubmoduleOptions(projectDir: string): {
|
|
|
4
4
|
targets: string;
|
|
5
5
|
};
|
|
6
6
|
export declare function cloneAndIsolate(projectDir: string, clonePath: string, branch?: string): void;
|
|
7
|
+
export declare function runGitCommandAbortable(gitCwd: string, args: string[], abortSignal?: AbortSignal): Promise<{
|
|
8
|
+
stdout: string;
|
|
9
|
+
stderr: string;
|
|
10
|
+
}>;
|
|
11
|
+
export declare function cloneAndIsolateAbortable(projectDir: string, clonePath: string, branch?: string, abortSignal?: AbortSignal): Promise<void>;
|
|
7
12
|
//# sourceMappingURL=clone-exec.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone-exec.d.ts","sourceRoot":"","sources":["../../../src/infra/task/clone-exec.ts"],"names":[],"mappings":"AAQA,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAyBnH;AAyBD,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAyD5F"}
|
|
1
|
+
{"version":3,"file":"clone-exec.d.ts","sourceRoot":"","sources":["../../../src/infra/task/clone-exec.ts"],"names":[],"mappings":"AAQA,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAyBnH;AAyBD,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAyD5F;AAcD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAAE,EACd,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CA2E7C;AAUD,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,IAAI,CAAC,CAuDf"}
|