@agent-vm/agent-vm-worker 0.0.30 → 0.0.32
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/context/gather-context.d.ts +1 -1
- package/dist/context/gather-context.d.ts.map +1 -1
- package/dist/context/gather-context.js +5 -5
- package/dist/context/gather-context.js.map +1 -1
- package/dist/coordinator/coordinator-helpers.d.ts.map +1 -1
- package/dist/coordinator/coordinator-helpers.js +0 -4
- package/dist/coordinator/coordinator-helpers.js.map +1 -1
- package/dist/coordinator/coordinator-types.d.ts +1 -1
- package/dist/coordinator/coordinator-types.d.ts.map +1 -1
- package/dist/coordinator/coordinator.js +2 -2
- package/dist/coordinator/coordinator.js.map +1 -1
- package/dist/coordinator/task-runner.d.ts +1 -1
- package/dist/coordinator/task-runner.d.ts.map +1 -1
- package/dist/coordinator/task-runner.js +66 -21
- package/dist/coordinator/task-runner.js.map +1 -1
- package/dist/git/repo-worktree-bootstrap.d.ts +8 -0
- package/dist/git/repo-worktree-bootstrap.d.ts.map +1 -0
- package/dist/git/repo-worktree-bootstrap.js +56 -0
- package/dist/git/repo-worktree-bootstrap.js.map +1 -0
- package/dist/main.js +2 -2
- package/dist/main.js.map +1 -1
- package/dist/prompt/message-builders.d.ts.map +1 -1
- package/dist/prompt/message-builders.js +1 -1
- package/dist/prompt/message-builders.js.map +1 -1
- package/dist/prompt/prompt-defaults.d.ts +4 -4
- package/dist/prompt/prompt-defaults.d.ts.map +1 -1
- package/dist/prompt/prompt-defaults.js +14 -12
- package/dist/prompt/prompt-defaults.js.map +1 -1
- package/dist/server.d.ts +2 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/shared/repo-location.d.ts +2 -1
- package/dist/shared/repo-location.d.ts.map +1 -1
- package/dist/shared/repo-location.js +2 -1
- package/dist/shared/repo-location.js.map +1 -1
- package/dist/state/task-event-types.d.ts +63 -2
- package/dist/state/task-event-types.d.ts.map +1 -1
- package/dist/state/task-event-types.js +57 -0
- package/dist/state/task-event-types.js.map +1 -1
- package/dist/state/task-state.d.ts +27 -0
- package/dist/state/task-state.d.ts.map +1 -1
- package/dist/state/task-state.js +151 -0
- package/dist/state/task-state.js.map +1 -1
- package/dist/work-phase/controller-tools/controller-tool-support.d.ts +20 -4
- package/dist/work-phase/controller-tools/controller-tool-support.d.ts.map +1 -1
- package/dist/work-phase/controller-tools/controller-tool-support.js +36 -15
- package/dist/work-phase/controller-tools/controller-tool-support.js.map +1 -1
- package/dist/work-phase/controller-tools/git-pull-default-tool.d.ts.map +1 -1
- package/dist/work-phase/controller-tools/git-pull-default-tool.js +196 -5
- package/dist/work-phase/controller-tools/git-pull-default-tool.js.map +1 -1
- package/dist/work-phase/controller-tools/git-push-tool.d.ts.map +1 -1
- package/dist/work-phase/controller-tools/git-push-tool.js +12 -5
- package/dist/work-phase/controller-tools/git-push-tool.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-state.js","sourceRoot":"","sources":["../../src/state/task-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"task-state.js","sourceRoot":"","sources":["../../src/state/task-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,30 @@ export interface ControllerToolRepoSelection {
|
|
|
3
3
|
readonly repo: RepoLocation | null;
|
|
4
4
|
readonly error: string | null;
|
|
5
5
|
}
|
|
6
|
-
export
|
|
7
|
-
readonly type: 'controller-error';
|
|
6
|
+
export type ControllerToolFailure = {
|
|
7
|
+
readonly type: 'controller-transport-error';
|
|
8
8
|
readonly success: false;
|
|
9
9
|
readonly artifact: string;
|
|
10
|
-
}
|
|
10
|
+
} | {
|
|
11
|
+
readonly type: 'controller-http-error';
|
|
12
|
+
readonly success: false;
|
|
13
|
+
readonly status: number;
|
|
14
|
+
readonly artifact: string;
|
|
15
|
+
} | {
|
|
16
|
+
readonly type: 'controller-parse-error';
|
|
17
|
+
readonly success: false;
|
|
18
|
+
readonly artifact: string;
|
|
19
|
+
};
|
|
20
|
+
export type CurrentBranchResult = {
|
|
21
|
+
readonly ok: true;
|
|
22
|
+
readonly branch: string | null;
|
|
23
|
+
} | {
|
|
24
|
+
readonly ok: false;
|
|
25
|
+
readonly error: string;
|
|
26
|
+
};
|
|
11
27
|
export declare function isControllerToolFailure(value: unknown): value is ControllerToolFailure;
|
|
12
28
|
export declare function selectRepo(repos: readonly RepoLocation[], params: Record<string, unknown>): ControllerToolRepoSelection;
|
|
13
|
-
export declare function currentBranch(cwd: string): Promise<
|
|
29
|
+
export declare function currentBranch(cwd: string): Promise<CurrentBranchResult>;
|
|
14
30
|
export declare function postControllerJson(options: {
|
|
15
31
|
readonly url: string;
|
|
16
32
|
readonly body: Record<string, unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-tool-support.d.ts","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/controller-tool-support.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,MAAM,WAAW,2BAA2B;IAC3C,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,
|
|
1
|
+
{"version":3,"file":"controller-tool-support.d.ts","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/controller-tool-support.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,MAAM,WAAW,2BAA2B;IAC3C,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,MAAM,qBAAqB,GAC9B;IACA,QAAQ,CAAC,IAAI,EAAE,4BAA4B,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CACzB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CACzB,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CACzB,CAAC;AAEL,MAAM,MAAM,mBAAmB,GAC5B;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACrD;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAElD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,qBAAqB,CAatF;AAED,wBAAgB,UAAU,CACzB,KAAK,EAAE,SAAS,YAAY,EAAE,EAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,2BAA2B,CAiC7B;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA4B7E;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE;IACjD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC3B,GAAG,OAAO,CAAC,OAAO,CAAC,CAkCnB"}
|
|
@@ -3,26 +3,28 @@ export function isControllerToolFailure(value) {
|
|
|
3
3
|
return (typeof value === 'object' &&
|
|
4
4
|
value !== null &&
|
|
5
5
|
'type' in value &&
|
|
6
|
-
value.type === 'controller-error'
|
|
6
|
+
(value.type === 'controller-transport-error' ||
|
|
7
|
+
value.type === 'controller-http-error' ||
|
|
8
|
+
value.type === 'controller-parse-error') &&
|
|
7
9
|
'success' in value &&
|
|
8
10
|
value.success === false &&
|
|
9
11
|
'artifact' in value &&
|
|
10
12
|
typeof value.artifact === 'string');
|
|
11
13
|
}
|
|
12
14
|
export function selectRepo(repos, params) {
|
|
13
|
-
const
|
|
15
|
+
const requestedWorkPath = typeof params.repoWorkPath === 'string' ? params.repoWorkPath : null;
|
|
14
16
|
const requestedRepoUrl = typeof params.repoUrl === 'string' ? params.repoUrl : null;
|
|
15
|
-
const configured = repos.map((repo) => `${repo.
|
|
17
|
+
const configured = repos.map((repo) => `${repo.workPath} (${repo.repoUrl})`).join(', ');
|
|
16
18
|
if (repos.length === 0) {
|
|
17
19
|
return { repo: null, error: 'No repo configured.' };
|
|
18
20
|
}
|
|
19
|
-
if (
|
|
20
|
-
const repo = repos.find((candidate) => candidate.
|
|
21
|
+
if (requestedWorkPath) {
|
|
22
|
+
const repo = repos.find((candidate) => candidate.workPath === requestedWorkPath) ?? null;
|
|
21
23
|
return repo
|
|
22
24
|
? { repo, error: null }
|
|
23
25
|
: {
|
|
24
26
|
repo: null,
|
|
25
|
-
error: `
|
|
27
|
+
error: `repoWorkPath '${requestedWorkPath}' not found; configured repos: ${configured}`,
|
|
26
28
|
};
|
|
27
29
|
}
|
|
28
30
|
if (requestedRepoUrl) {
|
|
@@ -37,7 +39,7 @@ export function selectRepo(repos, params) {
|
|
|
37
39
|
if (repos.length > 1) {
|
|
38
40
|
return {
|
|
39
41
|
repo: null,
|
|
40
|
-
error: 'Multiple repos configured; provide
|
|
42
|
+
error: 'Multiple repos configured; provide repoWorkPath or repoUrl.',
|
|
41
43
|
};
|
|
42
44
|
}
|
|
43
45
|
return { repo: repos[0] ?? null, error: null };
|
|
@@ -48,10 +50,28 @@ export async function currentBranch(cwd) {
|
|
|
48
50
|
reject: false,
|
|
49
51
|
timeout: 10_000,
|
|
50
52
|
});
|
|
51
|
-
if (
|
|
52
|
-
return
|
|
53
|
+
if (typeof result.exitCode !== 'number') {
|
|
54
|
+
return {
|
|
55
|
+
ok: false,
|
|
56
|
+
error: [
|
|
57
|
+
'git branch --show-current terminated without an exit code',
|
|
58
|
+
result.stdout,
|
|
59
|
+
result.stderr,
|
|
60
|
+
]
|
|
61
|
+
.filter((line) => line.trim().length > 0)
|
|
62
|
+
.join('\n'),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
if (result.exitCode !== 0) {
|
|
66
|
+
return {
|
|
67
|
+
ok: false,
|
|
68
|
+
error: ['git branch --show-current failed', result.stdout, result.stderr]
|
|
69
|
+
.filter((line) => line.trim().length > 0)
|
|
70
|
+
.join('\n'),
|
|
71
|
+
};
|
|
72
|
+
}
|
|
53
73
|
const branch = result.stdout.trim();
|
|
54
|
-
return branch.length > 0 ? branch : null;
|
|
74
|
+
return { ok: true, branch: branch.length > 0 ? branch : null };
|
|
55
75
|
}
|
|
56
76
|
export async function postControllerJson(options) {
|
|
57
77
|
let response;
|
|
@@ -65,16 +85,17 @@ export async function postControllerJson(options) {
|
|
|
65
85
|
}
|
|
66
86
|
catch (error) {
|
|
67
87
|
return {
|
|
68
|
-
type: 'controller-error',
|
|
88
|
+
type: 'controller-transport-error',
|
|
69
89
|
success: false,
|
|
70
|
-
artifact: `Controller request failed: ${error instanceof Error ? error.message : String(error)}`,
|
|
90
|
+
artifact: `Controller request failed before HTTP response: ${error instanceof Error ? error.message : String(error)}`,
|
|
71
91
|
};
|
|
72
92
|
}
|
|
73
93
|
const text = await response.text();
|
|
74
94
|
if (!response.ok) {
|
|
75
95
|
return {
|
|
76
|
-
type: 'controller-error',
|
|
96
|
+
type: 'controller-http-error',
|
|
77
97
|
success: false,
|
|
98
|
+
status: response.status,
|
|
78
99
|
artifact: `Controller request failed with HTTP ${String(response.status)}: ${text}`,
|
|
79
100
|
};
|
|
80
101
|
}
|
|
@@ -83,9 +104,9 @@ export async function postControllerJson(options) {
|
|
|
83
104
|
}
|
|
84
105
|
catch (error) {
|
|
85
106
|
return {
|
|
86
|
-
type: 'controller-error',
|
|
107
|
+
type: 'controller-parse-error',
|
|
87
108
|
success: false,
|
|
88
|
-
artifact: `Controller response
|
|
109
|
+
artifact: `Controller response parse failed: ${error instanceof Error ? error.message : String(error)}`,
|
|
89
110
|
};
|
|
90
111
|
}
|
|
91
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-tool-support.js","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/controller-tool-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"controller-tool-support.js","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/controller-tool-support.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-pull-default-tool.d.ts","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/git-pull-default-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"git-pull-default-tool.d.ts","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/git-pull-default-tool.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AA4KhF,MAAM,WAAW,6BAA6B;IAC7C,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;CACxC;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,6BAA6B,GAAG,cAAc,CA2G7F"}
|
|
@@ -1,13 +1,131 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { execa } from 'execa';
|
|
2
|
+
import { currentBranch, isControllerToolFailure, postControllerJson, selectRepo, } from './controller-tool-support.js';
|
|
2
3
|
const CONTROLLER_TOOL_TIMEOUT_MS = 120_000;
|
|
4
|
+
const GIT_TOOL_TIMEOUT_MS = 30_000;
|
|
5
|
+
function formatGitToolFailure(command, result) {
|
|
6
|
+
const headline = typeof result.exitCode === 'number'
|
|
7
|
+
? `${command} failed`
|
|
8
|
+
: `${command} terminated without an exit code`;
|
|
9
|
+
return [headline, result.stdout, result.stderr]
|
|
10
|
+
.filter((line) => line.trim().length > 0)
|
|
11
|
+
.join('\n');
|
|
12
|
+
}
|
|
13
|
+
function isSuccessfulGitToolResult(result) {
|
|
14
|
+
return typeof result.exitCode === 'number' && result.exitCode === 0;
|
|
15
|
+
}
|
|
16
|
+
function isObjectRecord(value) {
|
|
17
|
+
return typeof value === 'object' && value !== null;
|
|
18
|
+
}
|
|
19
|
+
function parseCurrentBranchSync(value) {
|
|
20
|
+
if (!isObjectRecord(value) || typeof value.status !== 'string')
|
|
21
|
+
return null;
|
|
22
|
+
switch (value.status) {
|
|
23
|
+
case 'fast-forwarded':
|
|
24
|
+
case 'default-branch':
|
|
25
|
+
return typeof value.branch === 'string' &&
|
|
26
|
+
typeof value.localHead === 'string' &&
|
|
27
|
+
typeof value.remoteHead === 'string'
|
|
28
|
+
? {
|
|
29
|
+
...value,
|
|
30
|
+
status: value.status,
|
|
31
|
+
branch: value.branch,
|
|
32
|
+
localHead: value.localHead,
|
|
33
|
+
remoteHead: value.remoteHead,
|
|
34
|
+
}
|
|
35
|
+
: null;
|
|
36
|
+
case 'ahead':
|
|
37
|
+
case 'detached':
|
|
38
|
+
case 'dirty-worktree':
|
|
39
|
+
case 'diverged':
|
|
40
|
+
case 'no-upstream':
|
|
41
|
+
case 'up-to-date':
|
|
42
|
+
return { ...value, status: value.status };
|
|
43
|
+
default:
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
function parseControllerPullDefaultResult(value) {
|
|
48
|
+
if (!isObjectRecord(value) || typeof value.kind !== 'string')
|
|
49
|
+
return null;
|
|
50
|
+
switch (value.kind) {
|
|
51
|
+
case 'advanced': {
|
|
52
|
+
if (value.success !== true || typeof value.message !== 'string')
|
|
53
|
+
return null;
|
|
54
|
+
if ('currentBranchSync' in value) {
|
|
55
|
+
const currentBranchSync = parseCurrentBranchSync(value.currentBranchSync);
|
|
56
|
+
if (!currentBranchSync)
|
|
57
|
+
return null;
|
|
58
|
+
return {
|
|
59
|
+
...value,
|
|
60
|
+
kind: 'advanced',
|
|
61
|
+
success: true,
|
|
62
|
+
message: value.message,
|
|
63
|
+
currentBranchSync,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
return {
|
|
67
|
+
...value,
|
|
68
|
+
kind: 'advanced',
|
|
69
|
+
success: true,
|
|
70
|
+
message: value.message,
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
case 'failed':
|
|
74
|
+
case 'refused-not-fast-forward':
|
|
75
|
+
return value.success === false
|
|
76
|
+
? {
|
|
77
|
+
...value,
|
|
78
|
+
kind: value.kind,
|
|
79
|
+
success: false,
|
|
80
|
+
...(typeof value.error === 'string' ? { error: value.error } : {}),
|
|
81
|
+
...(typeof value.message === 'string' ? { message: value.message } : {}),
|
|
82
|
+
}
|
|
83
|
+
: null;
|
|
84
|
+
default:
|
|
85
|
+
return null;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
function controllerResultMessage(value) {
|
|
89
|
+
if ('message' in value && typeof value.message === 'string') {
|
|
90
|
+
return value.message;
|
|
91
|
+
}
|
|
92
|
+
if ('error' in value && typeof value.error === 'string') {
|
|
93
|
+
return value.error;
|
|
94
|
+
}
|
|
95
|
+
return 'Controller returned pull-default success=false without a message.';
|
|
96
|
+
}
|
|
97
|
+
function shouldResetWorktreeAfterControllerPull(result) {
|
|
98
|
+
if (result.kind !== 'advanced')
|
|
99
|
+
return false;
|
|
100
|
+
const sync = result.currentBranchSync;
|
|
101
|
+
if (!sync)
|
|
102
|
+
return false;
|
|
103
|
+
switch (sync.status) {
|
|
104
|
+
case 'fast-forwarded':
|
|
105
|
+
return true;
|
|
106
|
+
case 'default-branch':
|
|
107
|
+
return sync.localHead !== sync.remoteHead;
|
|
108
|
+
case 'ahead':
|
|
109
|
+
case 'detached':
|
|
110
|
+
case 'dirty-worktree':
|
|
111
|
+
case 'diverged':
|
|
112
|
+
case 'no-upstream':
|
|
113
|
+
case 'up-to-date':
|
|
114
|
+
return false;
|
|
115
|
+
default: {
|
|
116
|
+
const exhaustiveStatus = sync;
|
|
117
|
+
return exhaustiveStatus;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
3
121
|
export function createGitPullDefaultTool(props) {
|
|
4
122
|
return {
|
|
5
123
|
name: 'git-pull-default',
|
|
6
|
-
description: 'Ask the controller to
|
|
124
|
+
description: 'Ask the controller to refresh origin/default and safely refresh your current branch. It fast-forwards the default branch ref, fetches origin/<currentBranch>, and if your current branch is clean and behind its upstream, fast-forwards that branch and resets the worktree to the new HEAD. It never merges or rebases. currentBranchSync.status can be fast-forwarded, up-to-date, ahead, diverged, dirty-worktree, no-upstream, detached, or default-branch; read the returned message before deciding the next git action.',
|
|
7
125
|
inputSchema: {
|
|
8
126
|
type: 'object',
|
|
9
127
|
properties: {
|
|
10
|
-
|
|
128
|
+
repoWorkPath: { type: 'string' },
|
|
11
129
|
repoUrl: { type: 'string' },
|
|
12
130
|
},
|
|
13
131
|
additionalProperties: false,
|
|
@@ -21,15 +139,88 @@ export function createGitPullDefaultTool(props) {
|
|
|
21
139
|
artifact: selected.error ?? 'Repo not found.',
|
|
22
140
|
};
|
|
23
141
|
}
|
|
142
|
+
const currentBranchResult = await currentBranch(selected.repo.workPath);
|
|
143
|
+
if (!currentBranchResult.ok) {
|
|
144
|
+
return {
|
|
145
|
+
type: 'pull-default',
|
|
146
|
+
success: false,
|
|
147
|
+
artifact: `Unable to read current git branch: ${currentBranchResult.error}`,
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
const currentHeadResult = await execa('git', ['rev-parse', 'HEAD'], {
|
|
151
|
+
cwd: selected.repo.workPath,
|
|
152
|
+
reject: false,
|
|
153
|
+
timeout: GIT_TOOL_TIMEOUT_MS,
|
|
154
|
+
});
|
|
155
|
+
if (!isSuccessfulGitToolResult(currentHeadResult)) {
|
|
156
|
+
return {
|
|
157
|
+
type: 'pull-default',
|
|
158
|
+
success: false,
|
|
159
|
+
artifact: `Unable to read current git HEAD: ${formatGitToolFailure('git rev-parse HEAD', currentHeadResult)}`,
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
const statusResult = await execa('git', ['status', '--porcelain'], {
|
|
163
|
+
cwd: selected.repo.workPath,
|
|
164
|
+
reject: false,
|
|
165
|
+
timeout: GIT_TOOL_TIMEOUT_MS,
|
|
166
|
+
});
|
|
167
|
+
if (!isSuccessfulGitToolResult(statusResult)) {
|
|
168
|
+
return {
|
|
169
|
+
type: 'pull-default',
|
|
170
|
+
success: false,
|
|
171
|
+
artifact: `Unable to read worktree status: ${formatGitToolFailure('git status --porcelain', statusResult)}`,
|
|
172
|
+
};
|
|
173
|
+
}
|
|
24
174
|
const result = await postControllerJson({
|
|
25
175
|
url: `${props.controllerBaseUrl}/zones/${props.zoneId}/tasks/${props.taskId}/pull-default`,
|
|
26
176
|
timeoutMs: CONTROLLER_TOOL_TIMEOUT_MS,
|
|
27
|
-
body: {
|
|
177
|
+
body: {
|
|
178
|
+
repoUrl: selected.repo.repoUrl,
|
|
179
|
+
currentBranch: currentBranchResult.branch,
|
|
180
|
+
currentHead: currentHeadResult.stdout.trim(),
|
|
181
|
+
worktreeDirty: statusResult.stdout.trim().length > 0,
|
|
182
|
+
},
|
|
28
183
|
});
|
|
29
184
|
if (isControllerToolFailure(result)) {
|
|
30
185
|
return { type: 'pull-default', success: false, artifact: result.artifact };
|
|
31
186
|
}
|
|
32
|
-
|
|
187
|
+
const pullResult = parseControllerPullDefaultResult(result);
|
|
188
|
+
if (!pullResult) {
|
|
189
|
+
return {
|
|
190
|
+
type: 'pull-default',
|
|
191
|
+
success: false,
|
|
192
|
+
artifact: 'Controller returned an unexpected pull-default response.',
|
|
193
|
+
};
|
|
194
|
+
}
|
|
195
|
+
if (!pullResult.success) {
|
|
196
|
+
return {
|
|
197
|
+
type: 'pull-default',
|
|
198
|
+
success: false,
|
|
199
|
+
artifact: controllerResultMessage(pullResult),
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
if (shouldResetWorktreeAfterControllerPull(pullResult)) {
|
|
203
|
+
const resetResult = await execa('git', ['reset', '--hard', 'HEAD'], {
|
|
204
|
+
cwd: selected.repo.workPath,
|
|
205
|
+
reject: false,
|
|
206
|
+
timeout: GIT_TOOL_TIMEOUT_MS,
|
|
207
|
+
});
|
|
208
|
+
if (!isSuccessfulGitToolResult(resetResult)) {
|
|
209
|
+
return {
|
|
210
|
+
type: 'pull-default',
|
|
211
|
+
success: false,
|
|
212
|
+
artifact: `Controller fast-forwarded the current branch, but worker reset failed: ${formatGitToolFailure('git reset --hard HEAD', resetResult)}`,
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
return {
|
|
217
|
+
type: 'pull-default',
|
|
218
|
+
success: true,
|
|
219
|
+
artifact: {
|
|
220
|
+
message: controllerResultMessage(pullResult),
|
|
221
|
+
result: pullResult,
|
|
222
|
+
},
|
|
223
|
+
};
|
|
33
224
|
},
|
|
34
225
|
};
|
|
35
226
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-pull-default-tool.js","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/git-pull-default-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"git-pull-default-tool.js","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/git-pull-default-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-push-tool.d.ts","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/git-push-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAUhF,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;CACxC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"git-push-tool.d.ts","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/git-push-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAUhF,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;CACxC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,cAAc,CAkD/E"}
|
|
@@ -7,7 +7,7 @@ export function createGitPushTool(props) {
|
|
|
7
7
|
inputSchema: {
|
|
8
8
|
type: 'object',
|
|
9
9
|
properties: {
|
|
10
|
-
|
|
10
|
+
repoWorkPath: { type: 'string' },
|
|
11
11
|
repoUrl: { type: 'string' },
|
|
12
12
|
},
|
|
13
13
|
additionalProperties: false,
|
|
@@ -17,11 +17,18 @@ export function createGitPushTool(props) {
|
|
|
17
17
|
if (!selected.repo) {
|
|
18
18
|
return { type: 'push', success: false, artifact: selected.error ?? 'Repo not found.' };
|
|
19
19
|
}
|
|
20
|
-
const
|
|
21
|
-
if (!
|
|
20
|
+
const branchResult = await currentBranch(selected.repo.workPath);
|
|
21
|
+
if (!branchResult.ok) {
|
|
22
|
+
return {
|
|
23
|
+
type: 'push',
|
|
24
|
+
success: false,
|
|
25
|
+
artifact: `Unable to read current git branch: ${branchResult.error}`,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
if (!branchResult.branch) {
|
|
22
29
|
return { type: 'push', success: false, artifact: 'Refusing to push from detached HEAD.' };
|
|
23
30
|
}
|
|
24
|
-
if (
|
|
31
|
+
if (branchResult.branch === selected.repo.baseBranch) {
|
|
25
32
|
return {
|
|
26
33
|
type: 'push',
|
|
27
34
|
success: false,
|
|
@@ -32,7 +39,7 @@ export function createGitPushTool(props) {
|
|
|
32
39
|
url: `${props.controllerBaseUrl}/zones/${props.zoneId}/tasks/${props.taskId}/push-branches`,
|
|
33
40
|
timeoutMs: CONTROLLER_TOOL_TIMEOUT_MS,
|
|
34
41
|
body: {
|
|
35
|
-
branches: [{ repoUrl: selected.repo.repoUrl, branchName }],
|
|
42
|
+
branches: [{ repoUrl: selected.repo.repoUrl, branchName: branchResult.branch }],
|
|
36
43
|
},
|
|
37
44
|
});
|
|
38
45
|
if (isControllerToolFailure(result)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-push-tool.js","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/git-push-tool.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAClB,UAAU,GACV,MAAM,8BAA8B,CAAC;AAEtC,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAS3C,MAAM,UAAU,iBAAiB,CAAC,KAA6B;IAC9D,OAAO;QACN,IAAI,EAAE,UAAU;QAChB,WAAW,EACV,sMAAsM;QACvM,WAAW,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACX,
|
|
1
|
+
{"version":3,"file":"git-push-tool.js","sourceRoot":"","sources":["../../../src/work-phase/controller-tools/git-push-tool.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAClB,UAAU,GACV,MAAM,8BAA8B,CAAC;AAEtC,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAS3C,MAAM,UAAU,iBAAiB,CAAC,KAA6B;IAC9D,OAAO;QACN,IAAI,EAAE,UAAU;QAChB,WAAW,EACV,sMAAsM;QACvM,WAAW,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACX,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAChC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aAC3B;YACD,oBAAoB,EAAE,KAAK;SAC3B;QACD,KAAK,CAAC,OAAO,CAAC,MAAM;YACnB,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACpB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,IAAI,iBAAiB,EAAE,CAAC;YACxF,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACjE,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;gBACtB,OAAO;oBACN,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,KAAK;oBACd,QAAQ,EAAE,sCAAsC,YAAY,CAAC,KAAK,EAAE;iBACpE,CAAC;YACH,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;gBAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,sCAAsC,EAAE,CAAC;YAC3F,CAAC;YACD,IAAI,YAAY,CAAC,MAAM,KAAK,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACtD,OAAO;oBACN,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,KAAK;oBACd,QAAQ,EAAE,oDAAoD,QAAQ,CAAC,IAAI,CAAC,UAAU,gEAAgE;iBACtJ,CAAC;YACH,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;gBACvC,GAAG,EAAE,GAAG,KAAK,CAAC,iBAAiB,UAAU,KAAK,CAAC,MAAM,UAAU,KAAK,CAAC,MAAM,gBAAgB;gBAC3F,SAAS,EAAE,0BAA0B;gBACrC,IAAI,EAAE;oBACL,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC;iBAC/E;aACD,CAAC,CAAC;YACH,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpE,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QAC1D,CAAC;KACD,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agent-vm/agent-vm-worker",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.32",
|
|
4
4
|
"description": "Worker process that runs inside a sandboxed VM, plans, edits, validates, and reviews coding tasks.",
|
|
5
5
|
"homepage": "https://github.com/ShravanSunder/agent-vm#readme",
|
|
6
6
|
"bugs": {
|