@patze/code-cli 0.20.0 → 0.24.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/CHANGELOG.md +54 -0
- package/VERSION +1 -1
- package/dist/backend/agent-trace.d.ts +4 -0
- package/dist/backend/agent-trace.d.ts.map +1 -1
- package/dist/backend/agent-trace.js +13 -0
- package/dist/backend/agent-trace.js.map +1 -1
- package/dist/backend/cancel-client.d.ts +19 -0
- package/dist/backend/cancel-client.d.ts.map +1 -0
- package/dist/backend/cancel-client.js +45 -0
- package/dist/backend/cancel-client.js.map +1 -0
- package/dist/backend/execute-client.d.ts +2 -0
- package/dist/backend/execute-client.d.ts.map +1 -1
- package/dist/backend/execute-client.js +2 -0
- package/dist/backend/execute-client.js.map +1 -1
- package/dist/backend/preview-payload.d.ts +6 -0
- package/dist/backend/preview-payload.d.ts.map +1 -1
- package/dist/backend/preview-payload.js +9 -0
- package/dist/backend/preview-payload.js.map +1 -1
- package/dist/backend/run-record.d.ts +2 -0
- package/dist/backend/run-record.d.ts.map +1 -1
- package/dist/backend/run-record.js +3 -1
- package/dist/backend/run-record.js.map +1 -1
- package/dist/cli/commands/exec.d.ts +5 -0
- package/dist/cli/commands/exec.d.ts.map +1 -0
- package/dist/cli/commands/exec.js +80 -0
- package/dist/cli/commands/exec.js.map +1 -0
- package/dist/cli/help.d.ts.map +1 -1
- package/dist/cli/help.js +1 -0
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/interactive/agent-activity.d.ts +11 -0
- package/dist/cli/interactive/agent-activity.d.ts.map +1 -0
- package/dist/cli/interactive/agent-activity.js +41 -0
- package/dist/cli/interactive/agent-activity.js.map +1 -0
- package/dist/cli/interactive/agent-event-feed.d.ts +14 -0
- package/dist/cli/interactive/agent-event-feed.d.ts.map +1 -0
- package/dist/cli/interactive/agent-event-feed.js +151 -0
- package/dist/cli/interactive/agent-event-feed.js.map +1 -0
- package/dist/cli/interactive/agent-events.d.ts +8 -1
- package/dist/cli/interactive/agent-events.d.ts.map +1 -1
- package/dist/cli/interactive/agent-events.js +7 -2
- package/dist/cli/interactive/agent-events.js.map +1 -1
- package/dist/cli/interactive/agent-execute-turn.d.ts +5 -0
- package/dist/cli/interactive/agent-execute-turn.d.ts.map +1 -1
- package/dist/cli/interactive/agent-execute-turn.js +162 -119
- package/dist/cli/interactive/agent-execute-turn.js.map +1 -1
- package/dist/cli/interactive/agent-stream-format.d.ts +1 -1
- package/dist/cli/interactive/agent-stream-format.d.ts.map +1 -1
- package/dist/cli/interactive/agent-stream-format.js +47 -23
- package/dist/cli/interactive/agent-stream-format.js.map +1 -1
- package/dist/cli/interactive/agent-turn.d.ts +4 -0
- package/dist/cli/interactive/agent-turn.d.ts.map +1 -1
- package/dist/cli/interactive/agent-turn.js +9 -0
- package/dist/cli/interactive/agent-turn.js.map +1 -1
- package/dist/cli/interactive/feed-run-stats.d.ts +9 -0
- package/dist/cli/interactive/feed-run-stats.d.ts.map +1 -0
- package/dist/cli/interactive/feed-run-stats.js +51 -0
- package/dist/cli/interactive/feed-run-stats.js.map +1 -0
- package/dist/cli/interactive/header.d.ts +6 -1
- package/dist/cli/interactive/header.d.ts.map +1 -1
- package/dist/cli/interactive/header.js +7 -3
- package/dist/cli/interactive/header.js.map +1 -1
- package/dist/cli/interactive/json-agent-stream.d.ts +8 -0
- package/dist/cli/interactive/json-agent-stream.d.ts.map +1 -0
- package/dist/cli/interactive/json-agent-stream.js +14 -0
- package/dist/cli/interactive/json-agent-stream.js.map +1 -0
- package/dist/cli/interactive/model-command.d.ts.map +1 -1
- package/dist/cli/interactive/model-command.js +37 -3
- package/dist/cli/interactive/model-command.js.map +1 -1
- package/dist/cli/interactive/plain-agent-render.d.ts.map +1 -1
- package/dist/cli/interactive/plain-agent-render.js +2 -0
- package/dist/cli/interactive/plain-agent-render.js.map +1 -1
- package/dist/cli/interactive/session-controller.d.ts +4 -0
- package/dist/cli/interactive/session-controller.d.ts.map +1 -1
- package/dist/cli/interactive/session-controller.js +23 -2
- package/dist/cli/interactive/session-controller.js.map +1 -1
- package/dist/cli/interactive/session-store.d.ts +3 -0
- package/dist/cli/interactive/session-store.d.ts.map +1 -1
- package/dist/cli/interactive/session-store.js +3 -0
- package/dist/cli/interactive/session-store.js.map +1 -1
- package/dist/cli/interactive/session.d.ts +19 -0
- package/dist/cli/interactive/session.d.ts.map +1 -1
- package/dist/cli/interactive/session.js +44 -0
- package/dist/cli/interactive/session.js.map +1 -1
- package/dist/cli/interactive/slash-dispatch.d.ts +3 -0
- package/dist/cli/interactive/slash-dispatch.d.ts.map +1 -1
- package/dist/cli/interactive/slash-dispatch.js +3 -0
- package/dist/cli/interactive/slash-dispatch.js.map +1 -1
- package/dist/cli/interactive/trace-glyphs.d.ts +13 -0
- package/dist/cli/interactive/trace-glyphs.d.ts.map +1 -0
- package/dist/cli/interactive/trace-glyphs.js +175 -0
- package/dist/cli/interactive/trace-glyphs.js.map +1 -0
- package/dist/cli/interactive/transcript-line-parse.js +2 -2
- package/dist/cli/interactive/transcript-line-parse.js.map +1 -1
- package/dist/cli/interactive/transcript-upsert.d.ts.map +1 -1
- package/dist/cli/interactive/transcript-upsert.js +21 -4
- package/dist/cli/interactive/transcript-upsert.js.map +1 -1
- package/dist/cli/main.d.ts.map +1 -1
- package/dist/cli/main.js +5 -0
- package/dist/cli/main.js.map +1 -1
- package/dist/config/model-preferences.d.ts +13 -0
- package/dist/config/model-preferences.d.ts.map +1 -0
- package/dist/config/model-preferences.js +50 -0
- package/dist/config/model-preferences.js.map +1 -0
- package/dist/config/models.d.ts +2 -1
- package/dist/config/models.d.ts.map +1 -1
- package/dist/config/models.js +5 -2
- package/dist/config/models.js.map +1 -1
- package/opentui/src/App.tsx +40 -5
- package/package.json +1 -1
|
@@ -4,6 +4,8 @@ import { runPhaseToAgentEvent, runRecordToResultEvent, traceEventToAgentEvent, }
|
|
|
4
4
|
import { formatRunBlockedHint } from "./agent-turn-format.js";
|
|
5
5
|
import { summarizeToolArgsFromDetail } from "./tool-arg-summary.js";
|
|
6
6
|
import { formatAgentReply, formatTranscriptEntry } from "./transcript-format.js";
|
|
7
|
+
import { formatThinkingUpsertLine, formatToolTraceBody, formatToolUpsertLine, } from "./trace-glyphs.js";
|
|
8
|
+
import { formatRunEditStatsLine, summarizeRunEditStats } from "./feed-run-stats.js";
|
|
7
9
|
export class AgentStreamTranscript {
|
|
8
10
|
sink;
|
|
9
11
|
replyThai;
|
|
@@ -37,6 +39,9 @@ export class AgentStreamTranscript {
|
|
|
37
39
|
}
|
|
38
40
|
this.lastPhase = label;
|
|
39
41
|
this.emitEvent(runPhaseToAgentEvent(label, status));
|
|
42
|
+
if (shouldSuppressRunPhaseLine(label)) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
40
45
|
this.sink.emit(formatRoleLine("run", `${label}${status && status !== label ? ` · ${status}` : ""}`));
|
|
41
46
|
}
|
|
42
47
|
emitTraceItem(item) {
|
|
@@ -78,14 +83,14 @@ export class AgentStreamTranscript {
|
|
|
78
83
|
}
|
|
79
84
|
this.sink.emit(formatRoleLine(role, text));
|
|
80
85
|
}
|
|
81
|
-
emitFinalRun(run) {
|
|
86
|
+
emitFinalRun(run, durationMs) {
|
|
82
87
|
this.flushPartialLine();
|
|
83
88
|
if (!run) {
|
|
84
89
|
this.sink.emit(formatAgentReply("Run finished but no record was returned."));
|
|
85
90
|
return;
|
|
86
91
|
}
|
|
87
92
|
if (isTerminalRunPhase(run.phase) && run.phase !== "completed") {
|
|
88
|
-
this.emitEvent(runRecordToResultEvent(run));
|
|
93
|
+
this.emitEvent(runRecordToResultEvent(run, durationMs));
|
|
89
94
|
const hint = formatRunBlockedHint(run.error_code, run.finding_codes, this.replyThai);
|
|
90
95
|
if (run.error_code || run.finding_codes.length > 0) {
|
|
91
96
|
this.sink.emit(formatAgentReply(hint));
|
|
@@ -95,14 +100,35 @@ export class AgentStreamTranscript {
|
|
|
95
100
|
return;
|
|
96
101
|
}
|
|
97
102
|
const reply = pickRunReplyText(run);
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
103
|
+
const editLine = formatRunEditStatsLine(summarizeRunEditStats(run.agent_trace));
|
|
104
|
+
this.emitEvent(runRecordToResultEvent(run, durationMs, editLine));
|
|
105
|
+
const streamedAlready = Boolean(this.textBuffer.trim() || this.agentPrefixEmitted);
|
|
106
|
+
if (reply && !streamedAlready) {
|
|
107
|
+
this.emitEvent({ type: "assistant_delta", text: reply });
|
|
108
|
+
if (!this.onAgentEvent) {
|
|
109
|
+
this.sink.emit(formatAgentReply(reply));
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
const completed = run.phase === "completed" || run.status === "completed";
|
|
113
|
+
const cancelled = run.phase === "cancelled" || run.status === "cancelled";
|
|
114
|
+
if (cancelled) {
|
|
115
|
+
if (!this.onAgentEvent) {
|
|
116
|
+
this.sink.emit(formatRoleLine("run", "✗ cancelled"));
|
|
117
|
+
}
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
if (completed && !this.onAgentEvent) {
|
|
121
|
+
const footer = [editLine ? `✓ completed · ${editLine}` : "✓ completed"];
|
|
122
|
+
this.sink.emit(formatRoleLine("run", footer[0]));
|
|
101
123
|
}
|
|
102
124
|
if (run.deliverable_paths.length > 0) {
|
|
103
125
|
this.sink.emit(formatRoleLine("run", `deliverables · ${run.deliverable_paths.slice(0, 3).join(", ")}${run.deliverable_paths.length > 3 ? "…" : ""}`));
|
|
126
|
+
this.sink.emit(formatRoleLine("run", "review with /diff · /approve · /apply (no auto-apply)"));
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
if (!completed && (run.error_code || run.finding_codes.length > 0)) {
|
|
130
|
+
this.sink.emit(formatRoleLine("run", "review with /diff when a patch is ready"));
|
|
104
131
|
}
|
|
105
|
-
this.sink.emit(formatRoleLine("run", "no auto-apply · review with /diff when a patch is ready"));
|
|
106
132
|
}
|
|
107
133
|
emitUpsertTrace(event) {
|
|
108
134
|
const text = formatTraceLine(event);
|
|
@@ -110,16 +136,11 @@ export class AgentStreamTranscript {
|
|
|
110
136
|
return;
|
|
111
137
|
}
|
|
112
138
|
const slot = this.traceSlots.get(event.id);
|
|
113
|
-
const
|
|
114
|
-
? event
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
: "[x]"
|
|
119
|
-
: event.status === "running"
|
|
120
|
-
? "[…]"
|
|
121
|
-
: "[·]";
|
|
122
|
-
const line = `${prefix} ${text}`;
|
|
139
|
+
const line = event.kind === "tool"
|
|
140
|
+
? formatToolUpsertLine(event)
|
|
141
|
+
: event.kind === "thinking"
|
|
142
|
+
? formatThinkingUpsertLine(event)
|
|
143
|
+
: text;
|
|
123
144
|
if (slot?.emitted && slot.lastText === line) {
|
|
124
145
|
return;
|
|
125
146
|
}
|
|
@@ -130,11 +151,15 @@ export class AgentStreamTranscript {
|
|
|
130
151
|
});
|
|
131
152
|
this.seenTraceIds.add(event.id);
|
|
132
153
|
this.flushPartialLine();
|
|
133
|
-
const role = event.kind === "tool" ? "tool" : "agent";
|
|
154
|
+
const role = event.kind === "tool" ? "tool" : event.kind === "thinking" ? "think" : "agent";
|
|
134
155
|
if (role === "agent") {
|
|
135
156
|
this.sink.emit(formatAgentReply(line));
|
|
136
157
|
return;
|
|
137
158
|
}
|
|
159
|
+
if (role === "think") {
|
|
160
|
+
this.sink.emit(formatRoleLine("think", line));
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
138
163
|
this.sink.emit(formatRoleLine(role, line));
|
|
139
164
|
}
|
|
140
165
|
emitStreamingText(event) {
|
|
@@ -174,15 +199,14 @@ function formatRoleLine(role, text) {
|
|
|
174
199
|
const label = role.padEnd(7);
|
|
175
200
|
return [`${label}${text}`];
|
|
176
201
|
}
|
|
202
|
+
function shouldSuppressRunPhaseLine(phase) {
|
|
203
|
+
const normalized = phase.trim().toLowerCase();
|
|
204
|
+
return normalized === "queued" || normalized === "running";
|
|
205
|
+
}
|
|
177
206
|
function formatTraceLine(event) {
|
|
178
207
|
const detail = event.detail?.trim() ?? "";
|
|
179
208
|
if (event.kind === "tool") {
|
|
180
|
-
|
|
181
|
-
const params = summarizeToolArgsFromDetail(name, event.detail);
|
|
182
|
-
if (params) {
|
|
183
|
-
return `${name} · ${params}`;
|
|
184
|
-
}
|
|
185
|
-
return detail ? `${name} · ${excerptTraceText(detail, 120)}` : name;
|
|
209
|
+
return formatToolTraceBody(event);
|
|
186
210
|
}
|
|
187
211
|
if (event.kind === "thinking") {
|
|
188
212
|
return detail ? excerptTraceText(detail, 160) : event.title;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-stream-format.js","sourceRoot":"","sources":["../../../src/cli/interactive/agent-stream-format.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,8BAA8B,CAAA;AAErC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAClF,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,sBAAsB,GAEvB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"agent-stream-format.js","sourceRoot":"","sources":["../../../src/cli/interactive/agent-stream-format.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
import { type PlanPreviewOptions } from "../commands/plan.js";
|
|
2
2
|
import type { InteractiveSession } from "./session.js";
|
|
3
|
+
import type { PatzeCodeRunRecord } from "../../backend/run-record.js";
|
|
3
4
|
import type { AgentEvent } from "./agent-events.js";
|
|
4
5
|
export type AgentTurnResult = {
|
|
5
6
|
lines: string[];
|
|
6
7
|
exitCode: number;
|
|
7
8
|
streamed?: boolean;
|
|
9
|
+
run?: PatzeCodeRunRecord | null;
|
|
8
10
|
};
|
|
9
11
|
export type AgentTurnOptions = PlanPreviewOptions & {
|
|
10
12
|
signal?: AbortSignal;
|
|
11
13
|
onTranscriptLine?: (line: string) => void;
|
|
12
14
|
onTranscriptPartial?: (chunk: string) => void;
|
|
13
15
|
onAgentEvent?: (event: AgentEvent) => void;
|
|
16
|
+
onActivity?: (label: string | null) => void;
|
|
17
|
+
useActivitySpinner?: boolean;
|
|
14
18
|
};
|
|
15
19
|
export declare function runAgentTurn(session: InteractiveSession, objective: string, options?: AgentTurnOptions): Promise<AgentTurnResult>;
|
|
16
20
|
//# sourceMappingURL=agent-turn.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-turn.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/agent-turn.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAgBtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAGnD,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"agent-turn.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/agent-turn.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAgBtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAGnD,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IACzC,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;IAC1C,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAA;IAC3C,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,kBAAkB,EAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,eAAe,CAAC,CAoM1B"}
|
|
@@ -68,6 +68,9 @@ export async function runAgentTurn(session, objective, options = {}) {
|
|
|
68
68
|
objective: trimmed,
|
|
69
69
|
previewArtifactDigest: "",
|
|
70
70
|
modelHint,
|
|
71
|
+
modelThinking: session.getModelThinking(),
|
|
72
|
+
modelFast: session.getModelFast(),
|
|
73
|
+
cursorAgentId: session.getCursorAgentId(),
|
|
71
74
|
conversationContext,
|
|
72
75
|
executionMode: session.getExecutionMode(),
|
|
73
76
|
fetchImpl: options.fetchImpl,
|
|
@@ -75,14 +78,20 @@ export async function runAgentTurn(session, objective, options = {}) {
|
|
|
75
78
|
onTranscriptLine: options.onTranscriptLine,
|
|
76
79
|
onTranscriptPartial: options.onTranscriptPartial,
|
|
77
80
|
onAgentEvent: options.onAgentEvent,
|
|
81
|
+
onActivity: options.onActivity,
|
|
82
|
+
useActivitySpinner: options.useActivitySpinner,
|
|
78
83
|
});
|
|
79
84
|
if (execute.run?.run_id) {
|
|
80
85
|
session.setLastRunId(execute.run.run_id);
|
|
81
86
|
}
|
|
87
|
+
if (execute.run?.cursor_agent_id) {
|
|
88
|
+
session.setCursorAgentId(execute.run.cursor_agent_id);
|
|
89
|
+
}
|
|
82
90
|
return {
|
|
83
91
|
lines: execute.lines,
|
|
84
92
|
exitCode: execute.exitCode,
|
|
85
93
|
streamed: execute.streamed,
|
|
94
|
+
run: execute.run,
|
|
86
95
|
};
|
|
87
96
|
}
|
|
88
97
|
const toolSteps = ["accept_task", "inspect_workspace"];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-turn.js","sourceRoot":"","sources":["../../../src/cli/interactive/agent-turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,cAAc,EAA2B,MAAM,qBAAqB,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAA;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAG9D,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,cAAc,GACf,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"agent-turn.js","sourceRoot":"","sources":["../../../src/cli/interactive/agent-turn.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export type RunEditStats = {
|
|
2
|
+
editCount: number;
|
|
3
|
+
linesAdded: number;
|
|
4
|
+
linesRemoved: number;
|
|
5
|
+
paths: string[];
|
|
6
|
+
};
|
|
7
|
+
export declare function summarizeRunEditStats(trace: unknown[]): RunEditStats;
|
|
8
|
+
export declare function formatRunEditStatsLine(stats: RunEditStats): string | null;
|
|
9
|
+
//# sourceMappingURL=feed-run-stats.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"feed-run-stats.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/feed-run-stats.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,EAAE,CAAA;CAChB,CAAA;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,YAAY,CAoCpE;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,CAazE"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { parseAgentTraceItem } from "../../backend/agent-trace.js";
|
|
2
|
+
import { parseTraceEditMeta } from "./trace-glyphs.js";
|
|
3
|
+
export function summarizeRunEditStats(trace) {
|
|
4
|
+
const paths = new Set();
|
|
5
|
+
let editCount = 0;
|
|
6
|
+
let linesAdded = 0;
|
|
7
|
+
let linesRemoved = 0;
|
|
8
|
+
for (const item of trace) {
|
|
9
|
+
const event = parseAgentTraceItem(item);
|
|
10
|
+
if (!event || event.kind !== "tool") {
|
|
11
|
+
continue;
|
|
12
|
+
}
|
|
13
|
+
const meta = parseTraceEditMeta(event);
|
|
14
|
+
if (!meta.action && meta.linesAdded === undefined && meta.linesRemoved === undefined) {
|
|
15
|
+
continue;
|
|
16
|
+
}
|
|
17
|
+
editCount += 1;
|
|
18
|
+
linesAdded += meta.linesAdded ?? 0;
|
|
19
|
+
linesRemoved += meta.linesRemoved ?? 0;
|
|
20
|
+
const raw = item && typeof item === "object" ? item : null;
|
|
21
|
+
const path = raw && typeof raw.path === "string"
|
|
22
|
+
? raw.path
|
|
23
|
+
: raw && typeof raw.file === "string"
|
|
24
|
+
? raw.file
|
|
25
|
+
: "";
|
|
26
|
+
if (path.trim()) {
|
|
27
|
+
paths.add(path.trim());
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return {
|
|
31
|
+
editCount,
|
|
32
|
+
linesAdded,
|
|
33
|
+
linesRemoved,
|
|
34
|
+
paths: [...paths],
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
export function formatRunEditStatsLine(stats) {
|
|
38
|
+
if (stats.editCount === 0 && stats.linesAdded === 0 && stats.linesRemoved === 0) {
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
const parts = [`${stats.editCount} edit${stats.editCount === 1 ? "" : "s"}`];
|
|
42
|
+
if (stats.linesAdded > 0 || stats.linesRemoved > 0) {
|
|
43
|
+
parts.push(`+${stats.linesAdded}/-${stats.linesRemoved}`);
|
|
44
|
+
}
|
|
45
|
+
if (stats.paths.length > 0) {
|
|
46
|
+
const shown = stats.paths.slice(0, 2).join(", ");
|
|
47
|
+
parts.push(stats.paths.length > 2 ? `${shown}…` : shown);
|
|
48
|
+
}
|
|
49
|
+
return parts.join(" · ");
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=feed-run-stats.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"feed-run-stats.js","sourceRoot":"","sources":["../../../src/cli/interactive/feed-run-stats.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,11 @@ export type HeaderOptions = {
|
|
|
4
4
|
width?: number;
|
|
5
5
|
color?: boolean;
|
|
6
6
|
};
|
|
7
|
-
export
|
|
7
|
+
export type HeaderSmartState = {
|
|
8
|
+
modelThinking?: boolean | null;
|
|
9
|
+
modelFast?: boolean | null;
|
|
10
|
+
cursorAgentId?: string | null;
|
|
11
|
+
};
|
|
12
|
+
export declare function renderInteractiveHeader(cwd: string, permissionMode?: PermissionMode, modelOverride?: string | null, executionMode?: ExecutionMode, options?: HeaderOptions, smart?: HeaderSmartState): string[];
|
|
8
13
|
export declare const INTERACTIVE_PROMPT = "\u203A ";
|
|
9
14
|
//# sourceMappingURL=header.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/header.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/header.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AASlE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAQvD,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAUD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;IAC9B,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC9B,CAAA;AAED,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,cAAc,EAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,EAC7B,aAAa,GAAE,aAAuB,EACtC,OAAO,GAAE,aAAkB,EAC3B,KAAK,GAAE,gBAAqB,GAC3B,MAAM,EAAE,CAsDV;AAUD,eAAO,MAAM,kBAAkB,YAAO,CAAA"}
|
|
@@ -5,6 +5,7 @@ import { resolveApproval } from "../../runtime/approvals.js";
|
|
|
5
5
|
import { resolveSandbox } from "../../runtime/sandbox.js";
|
|
6
6
|
import { guessWorkspaceRoot } from "../../runtime/workspace.js";
|
|
7
7
|
import { resolveEffectiveModel } from "../../config/models.js";
|
|
8
|
+
import { formatModelDisplay } from "../../config/model-preferences.js";
|
|
8
9
|
import { CLI_VERSION } from "../../version.js";
|
|
9
10
|
import { renderCard } from "../ui/box.js";
|
|
10
11
|
const YELLOW = "\x1b[33m";
|
|
@@ -16,7 +17,7 @@ function detectColor() {
|
|
|
16
17
|
function detectWidth() {
|
|
17
18
|
return typeof process.stdout.columns === "number" ? process.stdout.columns : 0;
|
|
18
19
|
}
|
|
19
|
-
export function renderInteractiveHeader(cwd, permissionMode, modelOverride, executionMode = "local", options = {}) {
|
|
20
|
+
export function renderInteractiveHeader(cwd, permissionMode, modelOverride, executionMode = "local", options = {}, smart = {}) {
|
|
20
21
|
const color = options.color ?? detectColor();
|
|
21
22
|
const width = options.width ?? detectWidth();
|
|
22
23
|
const config = loadConfig(cwd);
|
|
@@ -26,10 +27,13 @@ export function renderInteractiveHeader(cwd, permissionMode, modelOverride, exec
|
|
|
26
27
|
const workspace = guessWorkspaceRoot(cwd);
|
|
27
28
|
const mode = permissionMode ?? "read-only";
|
|
28
29
|
const permission = getPermissionModeDef(mode).label;
|
|
29
|
-
const model = resolveEffectiveModel({
|
|
30
|
+
const model = formatModelDisplay(resolveEffectiveModel({
|
|
30
31
|
sessionOverride: modelOverride,
|
|
31
32
|
configModel: config.model,
|
|
32
|
-
})
|
|
33
|
+
}), {
|
|
34
|
+
thinking: smart.modelThinking ?? null,
|
|
35
|
+
fast: smart.modelFast ?? null,
|
|
36
|
+
}, smart.cursorAgentId);
|
|
33
37
|
const card = renderCard({
|
|
34
38
|
title: `Patze Code · v${CLI_VERSION}`,
|
|
35
39
|
rows: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../src/cli/interactive/header.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../src/cli/interactive/header.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { AgentEvent } from "./agent-events.js";
|
|
2
|
+
export type JsonAgentStreamWriter = {
|
|
3
|
+
write: (event: AgentEvent) => void;
|
|
4
|
+
writeRaw: (payload: Record<string, unknown>) => void;
|
|
5
|
+
flush: () => void;
|
|
6
|
+
};
|
|
7
|
+
export declare function createJsonAgentStreamWriter(writeLine?: (line: string) => void): JsonAgentStreamWriter;
|
|
8
|
+
//# sourceMappingURL=json-agent-stream.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"json-agent-stream.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/json-agent-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;IAClC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACpD,KAAK,EAAE,MAAM,IAAI,CAAA;CAClB,CAAA;AAED,wBAAgB,2BAA2B,CACzC,SAAS,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAkD,GAC9E,qBAAqB,CAYvB"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export function createJsonAgentStreamWriter(writeLine = (line) => process.stdout.write(`${line}\n`)) {
|
|
2
|
+
return {
|
|
3
|
+
write(event) {
|
|
4
|
+
writeLine(JSON.stringify({ ...event, ts: Date.now() }));
|
|
5
|
+
},
|
|
6
|
+
writeRaw(payload) {
|
|
7
|
+
writeLine(JSON.stringify({ ...payload, ts: Date.now() }));
|
|
8
|
+
},
|
|
9
|
+
flush() {
|
|
10
|
+
// stdout is line-buffered for JSONL consumers
|
|
11
|
+
},
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=json-agent-stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"json-agent-stream.js","sourceRoot":"","sources":["../../../src/cli/interactive/json-agent-stream.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,2BAA2B,CACzC,YAAoC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC;IAE/E,OAAO;QACL,KAAK,CAAC,KAAiB;YACrB,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;QACzD,CAAC;QACD,QAAQ,CAAC,OAAgC;YACvC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;QAC3D,CAAC;QACD,KAAK;YACH,8CAA8C;QAChD,CAAC;KACF,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-command.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/model-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"model-command.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/model-command.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAetD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,GAAG;IAC/E,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;CACjB,CAiEA"}
|
|
@@ -1,20 +1,53 @@
|
|
|
1
|
+
import { formatModelPreferenceLabel, formatModelDisplay, resolveModelPreferenceToggle, } from "../../config/model-preferences.js";
|
|
1
2
|
import { formatModelPickerLines, isSupportedModelId, normalizeModelId, PATZE_SUPPORTED_MODELS, resolveEffectiveModel, } from "../../config/models.js";
|
|
2
3
|
import { loadConfig } from "../../config/config.js";
|
|
4
|
+
function parsePreferenceCommand(args) {
|
|
5
|
+
const trimmed = args.trim().toLowerCase();
|
|
6
|
+
const match = trimmed.match(/^(thinking|think|fast)\s+(.*)$/);
|
|
7
|
+
if (!match) {
|
|
8
|
+
return null;
|
|
9
|
+
}
|
|
10
|
+
const key = match[1] === "fast" ? "fast" : "thinking";
|
|
11
|
+
return { key, token: match[2]?.trim() || "toggle" };
|
|
12
|
+
}
|
|
3
13
|
export function dispatchModelCommand(session, args) {
|
|
4
14
|
const trimmed = args.trim();
|
|
5
15
|
const config = loadConfig(session.cwd);
|
|
16
|
+
const preferenceCommand = parsePreferenceCommand(trimmed);
|
|
17
|
+
if (preferenceCommand) {
|
|
18
|
+
const { key, token } = preferenceCommand;
|
|
19
|
+
const current = key === "thinking" ? session.getModelThinking() : session.getModelFast();
|
|
20
|
+
const next = resolveModelPreferenceToggle(current, token);
|
|
21
|
+
if (key === "thinking") {
|
|
22
|
+
session.setModelThinking(next);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
session.setModelFast(next);
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
lines: [formatModelPreferenceLabel(key, next)],
|
|
29
|
+
exitCode: 0,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
6
32
|
if (!trimmed) {
|
|
7
33
|
const current = resolveEffectiveModel({
|
|
8
34
|
sessionOverride: session.getModelOverride(),
|
|
9
35
|
configModel: config.model ?? null,
|
|
10
36
|
});
|
|
11
|
-
|
|
37
|
+
const lines = formatModelPickerLines(current, session.getModelPreferences());
|
|
38
|
+
if (session.getCursorAgentId()) {
|
|
39
|
+
lines.push("", `Agent session: ${session.getCursorAgentId()}`);
|
|
40
|
+
}
|
|
41
|
+
lines.push("", "Prefs: /model thinking on|off|toggle · /model fast on|off|toggle");
|
|
42
|
+
return { lines, exitCode: 0 };
|
|
12
43
|
}
|
|
13
44
|
if (trimmed.toLowerCase() === "clear") {
|
|
14
45
|
session.setModelOverride(null);
|
|
46
|
+
session.setModelThinking(null);
|
|
47
|
+
session.setModelFast(null);
|
|
15
48
|
const current = resolveEffectiveModel({ configModel: config.model ?? null });
|
|
16
49
|
return {
|
|
17
|
-
lines: [`Model
|
|
50
|
+
lines: [`Model prefs cleared · using ${current}`],
|
|
18
51
|
exitCode: 0,
|
|
19
52
|
};
|
|
20
53
|
}
|
|
@@ -32,8 +65,9 @@ export function dispatchModelCommand(session, args) {
|
|
|
32
65
|
};
|
|
33
66
|
}
|
|
34
67
|
session.setModelOverride(model);
|
|
68
|
+
const display = formatModelDisplay(model, session.getModelPreferences(), session.getCursorAgentId());
|
|
35
69
|
return {
|
|
36
|
-
lines: [`Model set to ${
|
|
70
|
+
lines: [`Model set to ${display} (this session).`],
|
|
37
71
|
exitCode: 0,
|
|
38
72
|
};
|
|
39
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-command.js","sourceRoot":"","sources":["../../../src/cli/interactive/model-command.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,MAAM,UAAU,oBAAoB,CAAC,OAA2B,EAAE,IAAY;IAI5E,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;IAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAEtC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,qBAAqB,CAAC;YACpC,eAAe,EAAE,OAAO,CAAC,gBAAgB,EAAE;YAC3C,WAAW,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;SAClC,CAAC,CAAA;QACF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"model-command.js","sourceRoot":"","sources":["../../../src/cli/interactive/model-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plain-agent-render.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/plain-agent-render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;AACrD,MAAM,MAAM,mBAAmB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;AAExD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,aAAa,CAAA;IACvB,cAAc,EAAE,mBAAmB,CAAA;IACnC,yBAAyB,EAAE,MAAM,OAAO,CAAA;CACzC,CAAA;AAED,mEAAmE;AACnE,wBAAgB,wBAAwB,CACtC,MAAM,GAAE,MAAM,CAAC,WAA4B,EAC3C,MAAM,GAAE,MAAM,CAAC,WAA4B,GAC1C,kBAAkB,CAqBpB;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,kBAAkB,GAC3B,IAAI,
|
|
1
|
+
{"version":3,"file":"plain-agent-render.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/plain-agent-render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;AACrD,MAAM,MAAM,mBAAmB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;AAExD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,aAAa,CAAA;IACvB,cAAc,EAAE,mBAAmB,CAAA;IACnC,yBAAyB,EAAE,MAAM,OAAO,CAAA;CACzC,CAAA;AAED,mEAAmE;AACnE,wBAAgB,wBAAwB,CACtC,MAAM,GAAE,MAAM,CAAC,WAA4B,EAC3C,MAAM,GAAE,MAAM,CAAC,WAA4B,GAC1C,kBAAkB,CAqBpB;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,kBAAkB,GAC3B,IAAI,CA6CN"}
|
|
@@ -55,6 +55,8 @@ export function renderPlainAgentEvent(event, handlers) {
|
|
|
55
55
|
const details = [
|
|
56
56
|
`status=${event.status}`,
|
|
57
57
|
event.durationMs !== undefined ? `duration=${formatDuration(event.durationMs)}` : undefined,
|
|
58
|
+
event.usage?.inputTokens !== undefined ? `input=${event.usage.inputTokens}` : undefined,
|
|
59
|
+
event.usage?.outputTokens !== undefined ? `output=${event.usage.outputTokens}` : undefined,
|
|
58
60
|
event.errorCode ? `error=${event.errorCode}` : undefined,
|
|
59
61
|
].filter(Boolean);
|
|
60
62
|
annotate(`[done] ${details.join(" ")}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plain-agent-render.js","sourceRoot":"","sources":["../../../src/cli/interactive/plain-agent-render.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plain-agent-render.js","sourceRoot":"","sources":["../../../src/cli/interactive/plain-agent-render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,WAAW,EACX,cAAc,GAEf,MAAM,mBAAmB,CAAA;AAW1B,mEAAmE;AACnE,MAAM,UAAU,wBAAwB,CACtC,SAA6B,OAAO,CAAC,MAAM,EAC3C,SAA6B,OAAO,CAAC,MAAM;IAE3C,IAAI,yBAAyB,GAAG,IAAI,CAAA;IAEpC,MAAM,QAAQ,GAAkB,CAAC,OAAO,EAAE,EAAE;QAC1C,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACpB,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;QAC5B,yBAAyB,GAAG,IAAI,CAAA;IAClC,CAAC,CAAA;IAED,MAAM,cAAc,GAAwB,CAAC,IAAI,EAAE,EAAE;QACnD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAClB,yBAAyB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACjD,CAAC,CAAA;IAED,OAAO;QACL,QAAQ;QACR,cAAc;QACd,yBAAyB,EAAE,GAAG,EAAE,CAAC,yBAAyB;KAC3D,CAAA;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,KAAiB,EACjB,QAA4B;IAE5B,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAA;IAE7C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,iBAAiB;YACpB,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAC1B,MAAK;QACP,KAAK,UAAU,CAAC,CAAC,CAAC;YAChB,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACpC,IAAI,IAAI,EAAE,CAAC;gBACT,QAAQ,CAAC,cAAc,IAAI,EAAE,CAAC,CAAA;YAChC,CAAC;YACD,MAAK;QACP,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YACrD,QAAQ,CAAC,UAAU,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,GAAG,MAAM,EAAE,CAAC,CAAA;YACzD,MAAK;QACP,CAAC;QACD,KAAK,QAAQ;YACX,IAAI,KAAK,CAAC,MAAM,KAAK,UAAU,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAChE,QAAQ,CACN,YAAY,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACtE,CAAA;YACH,CAAC;YACD,MAAK;QACP,KAAK,MAAM;YACT,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC/B,QAAQ,CAAC,UAAU,WAAW,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAA;YACzF,CAAC;YACD,MAAK;QACP,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,OAAO,GAAG;gBACd,UAAU,KAAK,CAAC,MAAM,EAAE;gBACxB,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;gBAC3F,KAAK,CAAC,KAAK,EAAE,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS;gBACvF,KAAK,CAAC,KAAK,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,SAAS;gBAC1F,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS;aACzD,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACjB,QAAQ,CAAC,UAAU,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACvC,MAAK;QACP,CAAC;QACD;YACE,MAAK;IACT,CAAC;AACH,CAAC"}
|
|
@@ -13,6 +13,10 @@ export type ProcessLineResult = {
|
|
|
13
13
|
};
|
|
14
14
|
export type ProcessLineContext = {
|
|
15
15
|
signal?: AbortSignal;
|
|
16
|
+
onActivity?: (label: string | null) => void;
|
|
17
|
+
useActivitySpinner?: boolean;
|
|
18
|
+
onAgentEvent?: (event: import("./agent-events.js").AgentEvent) => void;
|
|
19
|
+
assistantTurnId?: string;
|
|
16
20
|
};
|
|
17
21
|
export type InteractiveController = {
|
|
18
22
|
session: InteractiveSession;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-controller.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/session-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"session-controller.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/session-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAcjD,MAAM,MAAM,4BAA4B,GAAG;IACzC,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAA;IAC3C,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,mBAAmB,EAAE,UAAU,KAAK,IAAI,CAAA;IACtE,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,kBAAkB,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,iBAAiB,EAAE,MAAM,MAAM,EAAE,CAAA;IACjC,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,UAAU,EAClB,OAAO,CAAC,EAAE,kBAAkB,KACzB,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAChC,CAAA;AA+CD,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,qBAAqB,CAAC,CAGhC;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,4BAA4B,GACpC,qBAAqB,CAoIvB"}
|