baxian 1.1.0 → 1.2.0
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/agent/manager.d.ts +10 -9
- package/dist/agent/manager.d.ts.map +1 -1
- package/dist/agent/manager.js +181 -413
- package/dist/agent/manager.js.map +1 -1
- package/dist/agent/phase-signal-watcher.d.ts +1 -4
- package/dist/agent/phase-signal-watcher.d.ts.map +1 -1
- package/dist/agent/phase-signal-watcher.js +3 -22
- package/dist/agent/phase-signal-watcher.js.map +1 -1
- package/dist/agent/phase-signal.d.ts +1 -10
- package/dist/agent/phase-signal.d.ts.map +1 -1
- package/dist/agent/phase-signal.js +5 -8
- package/dist/agent/phase-signal.js.map +1 -1
- package/dist/agent/prompt.d.ts +1 -2
- package/dist/agent/prompt.d.ts.map +1 -1
- package/dist/agent/prompt.js +32 -63
- package/dist/agent/prompt.js.map +1 -1
- package/dist/agent/repo-store.d.ts +0 -1
- package/dist/agent/repo-store.d.ts.map +1 -1
- package/dist/agent/repo-store.js +0 -25
- package/dist/agent/repo-store.js.map +1 -1
- package/dist/agent/worktree.d.ts +1 -0
- package/dist/agent/worktree.d.ts.map +1 -1
- package/dist/agent/worktree.js +14 -0
- package/dist/agent/worktree.js.map +1 -1
- package/dist/api/agents.d.ts.map +1 -1
- package/dist/api/agents.js +4 -0
- package/dist/api/agents.js.map +1 -1
- package/dist/api/tasks.js +1 -1
- package/dist/api/tasks.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +8 -1
- package/dist/cli.js.map +1 -1
- package/dist/event/handlers.d.ts.map +1 -1
- package/dist/event/handlers.js +10 -430
- package/dist/event/handlers.js.map +1 -1
- package/dist/event/server-handlers.d.ts.map +1 -1
- package/dist/event/server-handlers.js +21 -14
- package/dist/event/server-handlers.js.map +1 -1
- package/dist/shared/constants.d.ts +1 -1
- package/dist/shared/constants.d.ts.map +1 -1
- package/dist/shared/constants.js +0 -6
- package/dist/shared/constants.js.map +1 -1
- package/dist/shared/types.d.ts +1 -1
- package/dist/shared/types.d.ts.map +1 -1
- package/dist/skills/server-feedback/SKILL.md +4 -2
- package/dist/terminal/attach.d.ts.map +1 -1
- package/dist/terminal/attach.js +8 -2
- package/dist/terminal/attach.js.map +1 -1
- package/dist/web/assets/index-OtgjyQI1.js +4 -0
- package/dist/web/index.html +1 -1
- package/package.json +1 -1
- package/dist/web/assets/index-DE_xpPQe.js +0 -4
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import type { AgentConfig
|
|
1
|
+
import type { AgentConfig } from '../shared/index.js';
|
|
2
2
|
import type { EventBus } from '../event/bus.js';
|
|
3
3
|
import type { PaneStreamerManager } from './pane-streamer-manager.js';
|
|
4
4
|
import { type PhaseSignalKind, type ReadFileSignal } from './phase-signal.js';
|
|
5
|
-
export declare function resolveEventType(kind: PhaseSignalKind, reviewMode: ReviewMode): EventType;
|
|
6
5
|
export interface PhaseSignalWatcherDeps {
|
|
7
6
|
paneStreamerManager: PaneStreamerManager;
|
|
8
7
|
eventBus: EventBus;
|
|
@@ -15,8 +14,6 @@ export interface PhaseSignalWatcherStartArgs {
|
|
|
15
14
|
/** Kinds we accept; first match wins. QA review verdict uses {pr-approved, pr-changes-requested}. */
|
|
16
15
|
expectedKinds: PhaseSignalKind | readonly PhaseSignalKind[] | ReadonlySet<PhaseSignalKind>;
|
|
17
16
|
token: string;
|
|
18
|
-
/** From TaskState.reviewMode (creation-time snapshot); routes colliding kinds. Default 'github'. */
|
|
19
|
-
reviewMode?: ReviewMode;
|
|
20
17
|
/** Server-mode QA context requests; fired per distinct request, does not consume the watch. */
|
|
21
18
|
onReadFile?: (req: ReadFileSignal) => void;
|
|
22
19
|
/** skipSnapshot=true: scrollback signal would re-fire on recovery. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase-signal-watcher.d.ts","sourceRoot":"","sources":["../../src/agent/phase-signal-watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"phase-signal-watcher.d.ts","sourceRoot":"","sources":["../../src/agent/phase-signal-watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAA0B,MAAM,oBAAoB,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAsC3B,MAAM,WAAW,sBAAsB;IACrC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;CAC5D;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,qGAAqG;IACrG,aAAa,EAAE,eAAe,GAAG,SAAS,eAAe,EAAE,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;IAC3F,KAAK,EAAE,MAAM,CAAC;IACd,+FAA+F;IAC/F,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IAC3C,sEAAsE;IACtE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,4FAA4F;IAC5F,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAUD,qBAAa,kBAAkB;IAGjB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;gBAE5B,IAAI,EAAE,sBAAsB;IAKnD,KAAK,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC;IAiEhE,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAO1B,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAI5B,+EAA+E;IAC/E,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC,eAAe,CAAC;IAI9D,yFAAyF;IACzF,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIpC,OAAO,CAAC,UAAU;YA4DJ,cAAc;IAmB5B,OAAO,CAAC,aAAa;YAcP,6BAA6B;CA2B5C"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
import { scanPhaseSignals, scanReadFileSignals, } from './phase-signal.js';
|
|
2
2
|
const MATCH_BUFFER_CHARS = 1024;
|
|
3
|
-
// Dispatch
|
|
3
|
+
// Dispatch table. Each pane-signal kind maps to the EventBus event type the
|
|
4
4
|
// handler chain will receive. pr-* kinds reuse existing event types (the
|
|
5
5
|
// data.source='pane-signal' tag tells the handler the trigger came from a
|
|
6
6
|
// pane signal echo rather than a GitHub poll cycle, so idempotency dedup can
|
|
7
7
|
// be applied if the same logical transition also gets reported by the poller).
|
|
8
8
|
const KIND_TO_EVENT_TYPE = {
|
|
9
|
-
'spec-
|
|
10
|
-
'spec-approved': 'spec.review.submitted',
|
|
11
|
-
'spec-changes-requested': 'spec.review.submitted',
|
|
12
|
-
'spec-fixed': 'spec.fix.submitted',
|
|
9
|
+
'spec-fixed': 'server.spec.fix.submitted',
|
|
13
10
|
'pr-created': 'pr.created',
|
|
14
11
|
'pr-approved': 'review.submitted',
|
|
15
12
|
'pr-changes-requested': 'review.submitted',
|
|
@@ -22,21 +19,6 @@ const KIND_TO_EVENT_TYPE = {
|
|
|
22
19
|
'code-fixed': 'server.code.fix.submitted',
|
|
23
20
|
'code-ready': 'server.code.published',
|
|
24
21
|
};
|
|
25
|
-
// spec-fixed exists in BOTH protocols: github mode routes it to the legacy
|
|
26
|
-
// handler, server mode to the new one. The mode comes from TaskState.reviewMode
|
|
27
|
-
// (snapshotted at task creation) via start args — never live config, so a hot
|
|
28
|
-
// mode flip cannot retarget an in-flight task's signals.
|
|
29
|
-
const SERVER_KIND_TO_EVENT_TYPE = {
|
|
30
|
-
'spec-fixed': 'server.spec.fix.submitted',
|
|
31
|
-
};
|
|
32
|
-
export function resolveEventType(kind, reviewMode) {
|
|
33
|
-
if (reviewMode === 'server') {
|
|
34
|
-
const mapped = SERVER_KIND_TO_EVENT_TYPE[kind];
|
|
35
|
-
if (mapped)
|
|
36
|
-
return mapped;
|
|
37
|
-
}
|
|
38
|
-
return KIND_TO_EVENT_TYPE[kind];
|
|
39
|
-
}
|
|
40
22
|
function normalizeKinds(input) {
|
|
41
23
|
if (input instanceof Set)
|
|
42
24
|
return input;
|
|
@@ -76,7 +58,6 @@ export class PhaseSignalWatcher {
|
|
|
76
58
|
agentId: args.agentId,
|
|
77
59
|
expectedKinds,
|
|
78
60
|
expectedToken: args.token,
|
|
79
|
-
reviewMode: args.reviewMode ?? 'github',
|
|
80
61
|
...(args.onReadFile ? { onReadFile: args.onReadFile } : {}),
|
|
81
62
|
seenReadFile: new Set(),
|
|
82
63
|
recovered: args.recovered ?? false,
|
|
@@ -173,7 +154,7 @@ export class PhaseSignalWatcher {
|
|
|
173
154
|
: undefined;
|
|
174
155
|
const event = {
|
|
175
156
|
id: '',
|
|
176
|
-
type:
|
|
157
|
+
type: KIND_TO_EVENT_TYPE[signal.kind],
|
|
177
158
|
timestamp: new Date().toISOString(),
|
|
178
159
|
projectId: entry.projectId,
|
|
179
160
|
agentId: entry.agentId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase-signal-watcher.js","sourceRoot":"","sources":["../../src/agent/phase-signal-watcher.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GAGpB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,
|
|
1
|
+
{"version":3,"file":"phase-signal-watcher.js","sourceRoot":"","sources":["../../src/agent/phase-signal-watcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,6 @@
|
|
|
1
|
-
export type PhaseSignalKind = 'spec-
|
|
1
|
+
export type PhaseSignalKind = 'spec-fixed' | 'pr-created' | 'pr-approved' | 'pr-changes-requested' | 'pr-fixed' | 'pr-merge-ready' | 'spec-done' | 'spec-reviewed' | 'code-done' | 'code-reviewed' | 'code-fixed' | 'code-ready';
|
|
2
2
|
export declare const PHASE_SIGNAL_KINDS: readonly PhaseSignalKind[];
|
|
3
3
|
export type PhaseSignal = {
|
|
4
|
-
kind: 'spec-created';
|
|
5
|
-
token: string;
|
|
6
|
-
} | {
|
|
7
|
-
kind: 'spec-approved';
|
|
8
|
-
token: string;
|
|
9
|
-
} | {
|
|
10
|
-
kind: 'spec-changes-requested';
|
|
11
|
-
token: string;
|
|
12
|
-
} | {
|
|
13
4
|
kind: 'spec-fixed';
|
|
14
5
|
token: string;
|
|
15
6
|
} | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase-signal.d.ts","sourceRoot":"","sources":["../../src/agent/phase-signal.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,eAAe,GACvB,
|
|
1
|
+
{"version":3,"file":"phase-signal.d.ts","sourceRoot":"","sources":["../../src/agent/phase-signal.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,eAAe,GACvB,YAAY,GACZ,YAAY,GACZ,aAAa,GACb,sBAAsB,GACtB,UAAU,GACV,gBAAgB,GAChB,WAAW,GACX,eAAe,GACf,WAAW,GACX,eAAe,GACf,YAAY,GACZ,YAAY,CAAC;AAEjB,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EAa/C,CAAC;AAKX,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACvD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAwB7D,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAID,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,OAAO,CAAC,eAAe,EAAE,YAAY,GAAG,YAAY,CAAC,EAC3D,KAAK,EAAE,MAAM,GACZ,MAAM,CAAC;AACV,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,MAAM,CAAC;AACV,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,CAAC;AAqBV,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAQD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAGtE;AAOD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAyB5D;AAID,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,CAUlE"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
export const PHASE_SIGNAL_KINDS = [
|
|
3
|
-
'spec-created',
|
|
4
|
-
'spec-approved',
|
|
5
|
-
'spec-changes-requested',
|
|
6
3
|
'spec-fixed',
|
|
7
4
|
'pr-created',
|
|
8
5
|
'pr-approved',
|
|
@@ -19,11 +16,11 @@ export const PHASE_SIGNAL_KINDS = [
|
|
|
19
16
|
const VALID_KINDS = new Set(PHASE_SIGNAL_KINDS);
|
|
20
17
|
const ANSI_PATTERN = /\x1b\[[0-?]*[ -/]*[@-~]/g;
|
|
21
18
|
const OSC_PATTERN = /\x1b\][\s\S]*?(?:\x07|\x1b\\)/g;
|
|
22
|
-
//
|
|
19
|
+
// Token range: 6-64 chars of base64url+dash.
|
|
23
20
|
// `pr-created` extracts the PR number (1+ digits) before the token segment.
|
|
24
21
|
const TOKEN_RANGE = '[A-Za-z0-9_-]{6,64}';
|
|
25
22
|
const COMPACT_SIGNAL_RE_PR_CREATED = new RegExp(`\\[bx:(pr-created):(\\d+):(${TOKEN_RANGE})\\]`, 'g');
|
|
26
|
-
const COMPACT_SIGNAL_RE_PLAIN = new RegExp(`\\[bx:(spec-
|
|
23
|
+
const COMPACT_SIGNAL_RE_PLAIN = new RegExp(`\\[bx:(spec-fixed|pr-approved|pr-changes-requested|pr-fixed|pr-merge-ready|spec-done|spec-reviewed|code-done|code-reviewed|code-fixed):(${TOKEN_RANGE})\\]`, 'g');
|
|
27
24
|
// code-ready's PR-number segment is optional: afterDone:'pr' emits 3-segment, 'branch' 2-segment.
|
|
28
25
|
const COMPACT_SIGNAL_RE_CODE_READY = new RegExp(`\\[bx:(code-ready)(?::(\\d+))?:(${TOKEN_RANGE})\\]`, 'g');
|
|
29
26
|
export function stripSignalAnsi(text) {
|
|
@@ -60,9 +57,9 @@ export function buildPhaseSignalTemplate(kind) {
|
|
|
60
57
|
}
|
|
61
58
|
// Scan a chunk of pane bytes for phase signals. Strips ANSI escapes, then
|
|
62
59
|
// strips whitespace so TUI soft-wrap inside the signal still matches.
|
|
63
|
-
// Returns signals in text-order: when develop dispatches
|
|
64
|
-
// pr-created}
|
|
65
|
-
// stream, not first by which regex pass we happened to run.
|
|
60
|
+
// Returns signals in text-order: when develop dispatches a multi-kind watcher
|
|
61
|
+
// (e.g. {spec-done, pr-created}), "first match wins" must mean first by position
|
|
62
|
+
// in the stream, not first by which regex pass we happened to run.
|
|
66
63
|
export function scanPhaseSignals(text) {
|
|
67
64
|
const stripped = stripSignalAnsi(text);
|
|
68
65
|
const compact = stripped.replace(/\s+/g, '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase-signal.js","sourceRoot":"","sources":["../../src/agent/phase-signal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"phase-signal.js","sourceRoot":"","sources":["../../src/agent/phase-signal.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/prompt.d.ts
CHANGED
|
@@ -21,8 +21,6 @@ export interface BuildPromptOpts {
|
|
|
21
21
|
/** Current pending pane-signal token. Required for phases that emit a signal. */
|
|
22
22
|
signalToken?: string;
|
|
23
23
|
postApproveRedispatchCount?: number;
|
|
24
|
-
/** findings.json 内容,caller 负责截断到 MAX_INLINE_FINDINGS_BYTES 以下。 */
|
|
25
|
-
specFindings?: string;
|
|
26
24
|
/** Caller-transmitted round — task field is stale during dispatch. */
|
|
27
25
|
currentSpecRound?: number;
|
|
28
26
|
excludeSkills?: readonly string[];
|
|
@@ -42,6 +40,7 @@ export interface BuildPromptOpts {
|
|
|
42
40
|
branch: string;
|
|
43
41
|
};
|
|
44
42
|
contentTruncated?: boolean;
|
|
43
|
+
hasQaPartner?: boolean;
|
|
45
44
|
}
|
|
46
45
|
export declare const MAX_INLINE_FINDINGS_BYTES: number;
|
|
47
46
|
export declare function buildPromptInline(opts: BuildPromptOpts): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/agent/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,KAAK,WAAW,EAAE,KAAK,SAAS,EAAsB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/J,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,eAAO,MAAM,eAAe,4BAA4B,CAAC;AAEzD,eAAO,MAAM,gBAAgB,QAAY,CAAC;AAE1C,eAAO,MAAM,4BAA4B,QAA0B,CAAC;AAEpE,qBAAa,eAAgB,SAAQ,KAAK;aACZ,KAAK,EAAE,MAAM;gBAAb,KAAK,EAAE,MAAM;CAO1C;AAED,qBAAa,0BAA2B,SAAQ,KAAK;aACvB,OAAO,EAAE,MAAM,EAAE;gBAAjB,OAAO,EAAE,MAAM,EAAE;CAO9C;AAyBD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,aAAa,EACvB,aAAa,GAAE,SAAS,MAAM,EAAO,GACpC,MAAM,CAqBR;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,WAAW,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,aAAa,CAAC;IAC7B,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,
|
|
1
|
+
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/agent/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,KAAK,WAAW,EAAE,KAAK,SAAS,EAAsB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/J,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,eAAO,MAAM,eAAe,4BAA4B,CAAC;AAEzD,eAAO,MAAM,gBAAgB,QAAY,CAAC;AAE1C,eAAO,MAAM,4BAA4B,QAA0B,CAAC;AAEpE,qBAAa,eAAgB,SAAQ,KAAK;aACZ,KAAK,EAAE,MAAM;gBAAb,KAAK,EAAE,MAAM;CAO1C;AAED,qBAAa,0BAA2B,SAAQ,KAAK;aACvB,OAAO,EAAE,MAAM,EAAE;gBAAjB,OAAO,EAAE,MAAM,EAAE;CAO9C;AAyBD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,aAAa,EACvB,aAAa,GAAE,SAAS,MAAM,EAAO,GACpC,MAAM,CAqBR;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,WAAW,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,aAAa,CAAC;IAC7B,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,sEAAsE;IACtE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAI1B,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,8EAA8E;IAC9E,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,sFAAsF;IACtF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE;QAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5D,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAG3B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,yBAAyB,QAAY,CAAC;AAOnD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAkC/D;AAwaD,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACrD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,uBAAuB,EAC5B,MAAM,EAAE,4BAA4B,GACnC,MAAM,CASR"}
|
package/dist/agent/prompt.js
CHANGED
|
@@ -83,7 +83,6 @@ export function buildPromptInline(opts) {
|
|
|
83
83
|
worktreePath: opts.worktreePath,
|
|
84
84
|
signalToken: opts.signalToken,
|
|
85
85
|
postApproveRedispatchCount: opts.postApproveRedispatchCount,
|
|
86
|
-
specFindings: opts.specFindings,
|
|
87
86
|
currentSpecRound: opts.currentSpecRound,
|
|
88
87
|
imagePaths: opts.imagePaths,
|
|
89
88
|
serverContent: opts.serverContent,
|
|
@@ -93,6 +92,7 @@ export function buildPromptInline(opts) {
|
|
|
93
92
|
serverPriorResponse: opts.serverPriorResponse,
|
|
94
93
|
serverAfterDone: opts.serverAfterDone,
|
|
95
94
|
contentTruncated: opts.contentTruncated,
|
|
95
|
+
hasQaPartner: opts.hasQaPartner,
|
|
96
96
|
});
|
|
97
97
|
const taskBlock = `<task>${cdata(taskBody)}</task>`;
|
|
98
98
|
const fullPrompt = skillsXml ? `${skillsXml}\n${taskBlock}` : taskBlock;
|
|
@@ -123,28 +123,38 @@ function buildReviewOrRecheckInstructions({ task, signalToken }, isRecheck) {
|
|
|
123
123
|
// the /compact cleanup path (not buildTaskBody), so its builder is empty by design.
|
|
124
124
|
const PHASE_PROMPT_BUILDERS = {
|
|
125
125
|
merge: () => '',
|
|
126
|
-
develop: ({ task, signalToken }) => {
|
|
126
|
+
develop: ({ task, signalToken, hasQaPartner }) => {
|
|
127
127
|
if (!signalToken)
|
|
128
128
|
return '';
|
|
129
|
+
// spec review 由 QA 执行;没有 QA 时不提供该路线,spec-done 会派不出去。
|
|
130
|
+
const offerSpec = hasQaPartner !== false;
|
|
129
131
|
if (task.reviewMode === 'server') {
|
|
130
132
|
return [
|
|
131
133
|
'Server review mode — no PRs, no branch pushes during review.',
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
134
|
+
...(offerSpec
|
|
135
|
+
? [
|
|
136
|
+
'Spec review (optional):',
|
|
137
|
+
`- To get QA spec review first, write the spec to ${SPEC_DOC_RELPATH} in your worktree (do NOT commit or push it), then signal:`,
|
|
138
|
+
` ${buildPhaseSignalTemplate('spec-done')}`,
|
|
139
|
+
` token: ${signalToken}`,
|
|
140
|
+
'- Otherwise implement the change, commit locally (do NOT push), then signal:',
|
|
141
|
+
]
|
|
142
|
+
: ['- Implement the change, commit locally (do NOT push), then signal:']),
|
|
137
143
|
` ${buildPhaseSignalTemplate('code-done')}`,
|
|
138
144
|
` token: ${signalToken}`,
|
|
139
145
|
'',
|
|
140
146
|
].join('\n');
|
|
141
147
|
}
|
|
142
148
|
return [
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
149
|
+
...(offerSpec
|
|
150
|
+
? [
|
|
151
|
+
'Spec review (optional):',
|
|
152
|
+
`- To get QA spec review first, write the spec to ${SPEC_DOC_RELPATH} in your worktree (do NOT commit or push it), then signal:`,
|
|
153
|
+
` ${buildPhaseSignalTemplate('spec-done')}`,
|
|
154
|
+
` token: ${signalToken}`,
|
|
155
|
+
'- Otherwise proceed straight to implementing the change. After `gh pr create`, signal:',
|
|
156
|
+
]
|
|
157
|
+
: ['Implement the change. After `gh pr create`, signal:']),
|
|
148
158
|
` ${buildPhaseSignalTemplate('pr-created')}`,
|
|
149
159
|
` token: ${signalToken}`,
|
|
150
160
|
'',
|
|
@@ -162,7 +172,7 @@ const PHASE_PROMPT_BUILDERS = {
|
|
|
162
172
|
].join('\n')
|
|
163
173
|
: [
|
|
164
174
|
'Code phase:',
|
|
165
|
-
|
|
175
|
+
`- Spec is approved. Implement code per the spec at ${SPEC_DOC_RELPATH}.`,
|
|
166
176
|
'- Commit+push, open PR via `gh pr create`. After it returns, signal with PR number:',
|
|
167
177
|
` ${buildPhaseSignalTemplate('pr-created')}`,
|
|
168
178
|
` token: ${signalToken}`,
|
|
@@ -204,49 +214,6 @@ const PHASE_PROMPT_BUILDERS = {
|
|
|
204
214
|
'- Do not merge the PR yourself from this phase.',
|
|
205
215
|
'',
|
|
206
216
|
].join('\n'),
|
|
207
|
-
'spec-review': ({ task, signalToken, currentSpecRound }) => {
|
|
208
|
-
const round = currentSpecRound ?? task.specReviewRound ?? 1;
|
|
209
|
-
const branch = task.branch ?? '<branch>';
|
|
210
|
-
return [
|
|
211
|
-
`Spec-review phase (round ${round}):`,
|
|
212
|
-
`- Fetch origin/${branch}, read spec at docs/spec/${task.id}.md (or wherever dev placed it).`,
|
|
213
|
-
`- Review for completeness, correctness, ambiguity, edge cases.`,
|
|
214
|
-
`- Write findings to .baxian/spec-review/round-${round}-findings.json:`,
|
|
215
|
-
` { "round": ${round}, "findings": [{ "id": "f-1", "severity": "critical"|"major"|"minor", "location": "...", "message": "..." }] }`,
|
|
216
|
-
`- Approve verdict MAY have empty findings array.`,
|
|
217
|
-
`- Commit findings, then push from detached HEAD: git push origin HEAD:${branch}`,
|
|
218
|
-
`- Verdict — exactly one:`,
|
|
219
|
-
` ${buildPhaseSignalTemplate('spec-approved')}`,
|
|
220
|
-
` ${buildPhaseSignalTemplate('spec-changes-requested')}`,
|
|
221
|
-
` token: ${signalToken}`,
|
|
222
|
-
'',
|
|
223
|
-
].join('\n');
|
|
224
|
-
},
|
|
225
|
-
'spec-fix': ({ task, signalToken, currentSpecRound, specFindings }) => {
|
|
226
|
-
const round = currentSpecRound ?? task.specReviewRound ?? 1;
|
|
227
|
-
const branch = task.branch ?? '<branch>';
|
|
228
|
-
const truncatedFindings = specFindings ? truncateFindings(specFindings) : undefined;
|
|
229
|
-
return [
|
|
230
|
-
`Spec-fix phase (round ${round}):`,
|
|
231
|
-
`- Pull latest task branch first: \`git pull origin ${branch}\`.`,
|
|
232
|
-
`- Read .baxian/spec-review/round-${round}-findings.json (cached below if present).`,
|
|
233
|
-
`- Each finding: fix (revise spec) or reject (with rationale).`,
|
|
234
|
-
`- Write .baxian/spec-review/round-${round}-response.json:`,
|
|
235
|
-
` { "round": ${round}, "responses": [{ "findingId": "f-1", "action": "fix"|"reject", "rationale": "..." }] }`,
|
|
236
|
-
`- Commit+push both files: \`git push origin HEAD:${branch}\`.`,
|
|
237
|
-
`- Signal:`,
|
|
238
|
-
` ${buildPhaseSignalTemplate('spec-fixed')}`,
|
|
239
|
-
` token: ${signalToken}`,
|
|
240
|
-
...(truncatedFindings
|
|
241
|
-
? [
|
|
242
|
-
'',
|
|
243
|
-
`findings.json (round ${round})${truncatedFindings.truncated ? ' [truncated, fetch full file from branch]' : ''}:`,
|
|
244
|
-
truncatedFindings.text,
|
|
245
|
-
]
|
|
246
|
-
: []),
|
|
247
|
-
'',
|
|
248
|
-
].join('\n');
|
|
249
|
-
},
|
|
250
217
|
review: (ctx) => buildReviewOrRecheckInstructions(ctx, false),
|
|
251
218
|
recheck: (ctx) => buildReviewOrRecheckInstructions(ctx, true),
|
|
252
219
|
'server-review': (ctx) => buildServerReviewInstructions(ctx, false),
|
|
@@ -289,11 +256,15 @@ const PHASE_PROMPT_BUILDERS = {
|
|
|
289
256
|
return [
|
|
290
257
|
`Server feedback phase (${isSpec ? 'spec' : 'code'} round ${round}):`,
|
|
291
258
|
`- QA findings are injected below. Handle EVERY finding by id:`,
|
|
292
|
-
|
|
259
|
+
isSpec
|
|
260
|
+
? ` fix — revise ${SPEC_DOC_RELPATH} in place (do NOT commit or push it).`
|
|
261
|
+
: ' fix — change the code/spec, commit; include commitSha in your response item.',
|
|
293
262
|
' reject — concrete rationale why the finding is wrong or not applicable.',
|
|
294
263
|
' out-of-scope — rationale plus where it is tracked (issue link or task note).',
|
|
295
264
|
`- Write your response to ${REVIEW_EXCHANGE_DIR}/response.json in your worktree (\`mkdir -p ${REVIEW_EXCHANGE_DIR}\` first). Atomic write: response.json.tmp then \`mv\`.`,
|
|
296
|
-
|
|
265
|
+
isSpec
|
|
266
|
+
? `- Schema: {"round":${round},"responses":[{"findingId":"f-1","action":"fix"|"reject"|"out-of-scope","rationale":"..."}]}`
|
|
267
|
+
: `- Schema: {"round":${round},"responses":[{"findingId":"f-1","action":"fix"|"reject"|"out-of-scope","rationale":"...","commitSha":"..."}]}`,
|
|
297
268
|
'- Every finding id MUST have exactly one response item (ids may look like b0-f-1 when the review was batched).',
|
|
298
269
|
`- Then emit exactly once: ${buildPhaseSignalTemplate(signalKind)}`,
|
|
299
270
|
` token: ${signalToken}`,
|
|
@@ -366,15 +337,12 @@ function buildServerReviewInstructions({ task, signalToken, serverContent, serve
|
|
|
366
337
|
].join('\n');
|
|
367
338
|
}
|
|
368
339
|
function buildTaskBody(args) {
|
|
369
|
-
const { task, phase, role, worktreePath, signalToken, postApproveRedispatchCount,
|
|
340
|
+
const { task, phase, role, worktreePath, signalToken, postApproveRedispatchCount, currentSpecRound, imagePaths, serverContent, serverDiffstat, serverBatch, serverPriorFindings, serverPriorResponse, serverAfterDone, contentTruncated, hasQaPartner, } = args;
|
|
370
341
|
const header = `Phase: ${phase}\nRole: ${role}\nTask ID: ${task.id}\nWorktree: ${worktreePath}\n` +
|
|
371
342
|
`cd into the worktree before any file operations.\n\n`;
|
|
372
343
|
if (phase === 'post-approve' && !signalToken) {
|
|
373
344
|
throw new Error('post-approve prompt requires signalToken');
|
|
374
345
|
}
|
|
375
|
-
if ((phase === 'spec-review' || phase === 'spec-fix') && !signalToken) {
|
|
376
|
-
throw new Error(`${phase} prompt requires signalToken`);
|
|
377
|
-
}
|
|
378
346
|
// 'code' (pr-created) always needs a token; review/recheck need it for the
|
|
379
347
|
// same-identity (422) fallback verdict signal; 'fix' needs it for the pr-fixed
|
|
380
348
|
// completion signal that drives fixing→review — see the phase blocks below.
|
|
@@ -391,9 +359,10 @@ function buildTaskBody(args) {
|
|
|
391
359
|
throw new Error(`buildTaskBody: no prompt builder registered for phase "${phase}"`);
|
|
392
360
|
}
|
|
393
361
|
const phaseInstructions = phaseBuilder({
|
|
394
|
-
task, signalToken, currentSpecRound,
|
|
362
|
+
task, signalToken, currentSpecRound, postApproveRedispatchCount,
|
|
395
363
|
serverContent, serverDiffstat, serverBatch,
|
|
396
364
|
serverPriorFindings, serverPriorResponse, serverAfterDone, contentTruncated,
|
|
365
|
+
hasQaPartner,
|
|
397
366
|
});
|
|
398
367
|
const titleAndBody = `Title: ${task.title}\n\n${task.description}`;
|
|
399
368
|
const imagesBlock = imagePaths && imagePaths.length > 0
|
package/dist/agent/prompt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/agent/prompt.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/agent/prompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,6 @@ export declare class RepoStore {
|
|
|
16
16
|
constructor(runner: CommandRunner, repoSlug: string, mode: AgentMode, host: HostConfig | undefined, cache: RepoStoreCache);
|
|
17
17
|
ensure(): Promise<string>;
|
|
18
18
|
refresh(absRepoPath: string): Promise<void>;
|
|
19
|
-
readFileFromBranch(absRepoPath: string, branch: string, filePath: string): Promise<string | null>;
|
|
20
19
|
private hostKey;
|
|
21
20
|
private resolveAbsPath;
|
|
22
21
|
private resolveHome;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo-store.d.ts","sourceRoot":"","sources":["../../src/agent/repo-store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACrC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,wBAAgB,oBAAoB,IAAI,cAAc,CAErD;AAMD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAS3D;AAID,qBAAa,SAAS;IAElB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,KAAK;gBAJL,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,UAAU,GAAG,SAAS,EAC5B,KAAK,EAAE,cAAc;IAGzB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAUzB,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"repo-store.d.ts","sourceRoot":"","sources":["../../src/agent/repo-store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACrC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,wBAAgB,oBAAoB,IAAI,cAAc,CAErD;AAMD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAS3D;AAID,qBAAa,SAAS;IAElB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,KAAK;gBAJL,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,UAAU,GAAG,SAAS,EAC5B,KAAK,EAAE,cAAc;IAGzB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAUzB,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,OAAO,CAAC,OAAO;YASD,cAAc;YAMd,WAAW;YAoBX,aAAa;YAuCb,YAAY;YAaZ,aAAa;CAM5B"}
|
package/dist/agent/repo-store.js
CHANGED
|
@@ -42,31 +42,6 @@ export class RepoStore {
|
|
|
42
42
|
const cacheKey = `${this.hostKey()}:${absRepoPath}`;
|
|
43
43
|
await this.runUnderMutex(cacheKey, () => this.fetchIfStale(cacheKey, absRepoPath));
|
|
44
44
|
}
|
|
45
|
-
async readFileFromBranch(absRepoPath, branch, filePath) {
|
|
46
|
-
// FETCH_HEAD 共享:并发 readFileFromBranch 会互相覆盖 → 用 runUnderMutex 串行化。
|
|
47
|
-
const cacheKey = `${this.hostKey()}:${absRepoPath}`;
|
|
48
|
-
return this.runUnderMutex(cacheKey, async () => {
|
|
49
|
-
const fetchCmd = `cd ${shellQuote(absRepoPath)} && git fetch origin ${shellQuote(branch)}`;
|
|
50
|
-
const fetchResult = await this.runner.exec(fetchCmd);
|
|
51
|
-
if (fetchResult.exitCode !== 0) {
|
|
52
|
-
throw new Error(`git fetch origin ${branch} failed at ${absRepoPath}: ${fetchResult.stderr || fetchResult.stdout}`);
|
|
53
|
-
}
|
|
54
|
-
// FETCH_HEAD is the only ref guaranteed updated by `git fetch origin <branch>`.
|
|
55
|
-
const showCmd = `cd ${shellQuote(absRepoPath)} && git show FETCH_HEAD:${shellQuote(filePath)}`;
|
|
56
|
-
const showResult = await this.runner.exec(showCmd);
|
|
57
|
-
if (showResult.exitCode === 0)
|
|
58
|
-
return showResult.stdout;
|
|
59
|
-
const stderr = (showResult.stderr || '').toLowerCase();
|
|
60
|
-
if (stderr.includes('does not exist')
|
|
61
|
-
|| stderr.includes('exists on disk, but not in')
|
|
62
|
-
|| stderr.includes("path '")
|
|
63
|
-
|| stderr.includes('fatal: path')
|
|
64
|
-
|| stderr.includes('unknown revision')) {
|
|
65
|
-
return null;
|
|
66
|
-
}
|
|
67
|
-
throw new Error(`git show FETCH_HEAD:${filePath} failed at ${absRepoPath}: ${showResult.stderr || showResult.stdout}`);
|
|
68
|
-
});
|
|
69
|
-
}
|
|
70
45
|
hostKey() {
|
|
71
46
|
if (this.mode === 'local')
|
|
72
47
|
return 'local';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo-store.js","sourceRoot":"","sources":["../../src/agent/repo-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AASvD,MAAM,UAAU,oBAAoB;IAClC,OAAO,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;AACxE,CAAC;AAED,MAAM,eAAe,GAAG,wDAAwD,CAAC;AACjF,MAAM,iBAAiB,GAAG,gDAAgD,CAAC;AAC3E,MAAM,iBAAiB,GAAG,yDAAyD,CAAC;AAEpF,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC1C,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,OAAO,CACL,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC;WAChC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;WACrC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;WACrC,IAAI,CACR,CAAC;AACJ,CAAC;AAED,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEjC,MAAM,OAAO,SAAS;IAEV;IACA;IACA;IACA;IACA;IALV,YACU,MAAqB,EACrB,QAAgB,EAChB,IAAe,EACf,IAA4B,EAC5B,KAAqB;QAJrB,WAAM,GAAN,MAAM,CAAe;QACrB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAW;QACf,SAAI,GAAJ,IAAI,CAAwB;QAC5B,UAAK,GAAL,KAAK,CAAgB;IAC5B,CAAC;IAEJ,KAAK,CAAC,MAAM;QACV,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YACtC,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAC/C,OAAO,WAAW,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,WAAmB;QAC/B,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC;QACpD,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IACrF,CAAC;
|
|
1
|
+
{"version":3,"file":"repo-store.js","sourceRoot":"","sources":["../../src/agent/repo-store.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/worktree.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export declare class WorktreeManager {
|
|
|
5
5
|
create(repoDir: string, taskId: string, baseRef?: string): Promise<string>;
|
|
6
6
|
createDetached(repoDir: string, taskId: string, remoteBranch: string): Promise<string>;
|
|
7
7
|
createDetachedAtBase(repoDir: string, taskId: string): Promise<string>;
|
|
8
|
+
private excludeBaxianDir;
|
|
8
9
|
remove(repoDir: string, worktreePath: string): Promise<void>;
|
|
9
10
|
list(repoDir: string): Promise<string[]>;
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/agent/worktree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AASjD,qBAAa,eAAe;IACd,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEnC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/agent/worktree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AASjD,qBAAa,eAAe;IACd,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEnC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAa1E,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAetF,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAe9D,gBAAgB;IAaxB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAM/C"}
|