zelari-code 0.7.12 → 1.0.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/README.md +9 -2
- package/dist/cli/app.js +4 -3
- package/dist/cli/app.js.map +1 -1
- package/dist/cli/components/StatusBar.js +1 -1
- package/dist/cli/components/StatusBar.js.map +1 -1
- package/dist/cli/components/toolFormat.js +180 -56
- package/dist/cli/components/toolFormat.js.map +1 -1
- package/dist/cli/councilDispatcher.js +6 -1
- package/dist/cli/councilDispatcher.js.map +1 -1
- package/dist/cli/headless.js +2 -3
- package/dist/cli/headless.js.map +1 -1
- package/dist/cli/hooks/chatState.js +14 -12
- package/dist/cli/hooks/chatState.js.map +1 -1
- package/dist/cli/hooks/eventsToMessages.js +39 -28
- package/dist/cli/hooks/eventsToMessages.js.map +1 -1
- package/dist/cli/hooks/messageHelpers.js +23 -15
- package/dist/cli/hooks/messageHelpers.js.map +1 -1
- package/dist/cli/hooks/useChatTurn.js +226 -18
- package/dist/cli/hooks/useChatTurn.js.map +1 -1
- package/dist/cli/hooks/useSlashDispatch.js +15 -2
- package/dist/cli/hooks/useSlashDispatch.js.map +1 -1
- package/dist/cli/main.bundled.js +7357 -3774
- package/dist/cli/main.bundled.js.map +4 -4
- package/dist/cli/main.js +1 -1
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/memory/fileBackend.js +140 -0
- package/dist/cli/memory/fileBackend.js.map +1 -0
- package/dist/cli/runHeadless.js +1 -1
- package/dist/cli/runHeadless.js.map +1 -1
- package/dist/cli/slashCommands.js +12 -1
- package/dist/cli/slashCommands.js.map +1 -1
- package/dist/cli/workspace/buildLessonsSummary.js +21 -0
- package/dist/cli/workspace/buildLessonsSummary.js.map +1 -0
- package/dist/cli/workspace/index.js +7 -7
- package/dist/cli/workspace/index.js.map +1 -1
- package/dist/cli/workspace/postCouncilHook.js +157 -2
- package/dist/cli/workspace/postCouncilHook.js.map +1 -1
- package/dist/cli/workspace/projectSmoke.js +98 -0
- package/dist/cli/workspace/projectSmoke.js.map +1 -0
- package/dist/cli/workspace/stubs.js +37 -1
- package/dist/cli/workspace/stubs.js.map +1 -1
- package/dist/cli/workspace/workspaceSummary.js +67 -10
- package/dist/cli/workspace/workspaceSummary.js.map +1 -1
- package/dist/cli/zelariMission.js +136 -0
- package/dist/cli/zelariMission.js.map +1 -0
- package/package.json +5 -4
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { formatToolSummary } from
|
|
1
|
+
import { formatToolSummary, toolResultForStorage, } from "../components/toolFormat.js";
|
|
2
2
|
export const EMPTY_LIVE = { streaming: null, runningTools: [] };
|
|
3
3
|
/**
|
|
4
4
|
* Append a finalized message (system/user/sealed-assistant/completed-tool).
|
|
@@ -24,7 +24,7 @@ export function setStreaming(setLive, fullContent, ts, memberContext) {
|
|
|
24
24
|
setLive((prev) => {
|
|
25
25
|
const cur = prev.streaming;
|
|
26
26
|
if (cur &&
|
|
27
|
-
cur.role ===
|
|
27
|
+
cur.role === "assistant" &&
|
|
28
28
|
(cur.memberId ?? null) === (memberContext?.memberId ?? null)) {
|
|
29
29
|
return { ...prev, streaming: { ...cur, content: fullContent, ts } };
|
|
30
30
|
}
|
|
@@ -32,11 +32,15 @@ export function setStreaming(setLive, fullContent, ts, memberContext) {
|
|
|
32
32
|
...prev,
|
|
33
33
|
streaming: {
|
|
34
34
|
id: `streaming-${crypto.randomUUID()}`,
|
|
35
|
-
role:
|
|
35
|
+
role: "assistant",
|
|
36
36
|
content: fullContent,
|
|
37
37
|
ts,
|
|
38
|
-
...(memberContext?.memberId
|
|
39
|
-
|
|
38
|
+
...(memberContext?.memberId
|
|
39
|
+
? { memberId: memberContext.memberId }
|
|
40
|
+
: {}),
|
|
41
|
+
...(memberContext?.memberName
|
|
42
|
+
? { memberName: memberContext.memberName }
|
|
43
|
+
: {}),
|
|
40
44
|
},
|
|
41
45
|
};
|
|
42
46
|
});
|
|
@@ -52,9 +56,9 @@ export function setStreaming(setLive, fullContent, ts, memberContext) {
|
|
|
52
56
|
export function finalizeStreaming(setFinalized, setLive) {
|
|
53
57
|
setLive((prev) => {
|
|
54
58
|
const cur = prev.streaming;
|
|
55
|
-
if (!cur || !cur.id.startsWith(
|
|
59
|
+
if (!cur || !cur.id.startsWith("streaming-"))
|
|
56
60
|
return prev;
|
|
57
|
-
const sealed = { ...cur, id: cur.id.slice(
|
|
61
|
+
const sealed = { ...cur, id: cur.id.slice("streaming-".length) };
|
|
58
62
|
setFinalized((fin) => [...fin, sealed]);
|
|
59
63
|
return { ...prev, streaming: null };
|
|
60
64
|
});
|
|
@@ -69,7 +73,7 @@ export function finalizeStreaming(setFinalized, setLive) {
|
|
|
69
73
|
* is line-based in the formatter (ZELARI_TOOL_OUTPUT_LINES); this constant is
|
|
70
74
|
* only a memory bound.
|
|
71
75
|
*/
|
|
72
|
-
export
|
|
76
|
+
export { TOOL_RESULT_PREVIEW_CHARS } from "../components/toolFormat.js";
|
|
73
77
|
/** Max chars of the JSON args preview shown on the tool summary line. */
|
|
74
78
|
export const TOOL_ARGS_PREVIEW_CHARS = 120;
|
|
75
79
|
/**
|
|
@@ -86,7 +90,7 @@ export function startTool(setLive, toolName, toolCallId, args, ts) {
|
|
|
86
90
|
...prev.runningTools,
|
|
87
91
|
{
|
|
88
92
|
id: crypto.randomUUID(),
|
|
89
|
-
role:
|
|
93
|
+
role: "tool",
|
|
90
94
|
content: argsPreview,
|
|
91
95
|
ts,
|
|
92
96
|
toolName,
|
|
@@ -123,9 +127,7 @@ export function completeTool(setFinalized, setLive, toolCallId, isError, duratio
|
|
|
123
127
|
toolDurationMs: durationMs,
|
|
124
128
|
...(result !== undefined
|
|
125
129
|
? {
|
|
126
|
-
toolResult:
|
|
127
|
-
? `${result.slice(0, TOOL_RESULT_PREVIEW_CHARS)}…`
|
|
128
|
-
: result,
|
|
130
|
+
toolResult: toolResultForStorage(tool.toolName ?? "", result, isError),
|
|
129
131
|
}
|
|
130
132
|
: {}),
|
|
131
133
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatState.js","sourceRoot":"","sources":["../../../src/cli/hooks/chatState.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"chatState.js","sourceRoot":"","sources":["../../../src/cli/hooks/chatState.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { formatToolSummary, toolResultForStorage, } from "../components/toolFormat.js";
|
|
2
|
+
import { newSessionId } from "../sessionManager.js";
|
|
2
3
|
/**
|
|
3
4
|
* eventsToMessages — pure helper: replay a BrainEvent log into ChatMessage[].
|
|
4
5
|
*
|
|
@@ -11,62 +12,72 @@ import { newSessionId } from '../sessionManager.js';
|
|
|
11
12
|
*/
|
|
12
13
|
export function eventsToMessages(events) {
|
|
13
14
|
const out = [];
|
|
14
|
-
let assistantBuffer =
|
|
15
|
-
let assistantId =
|
|
15
|
+
let assistantBuffer = "";
|
|
16
|
+
let assistantId = "";
|
|
16
17
|
for (const e of events) {
|
|
17
|
-
if (e.type ===
|
|
18
|
-
if (assistantId ===
|
|
18
|
+
if (e.type === "message_delta") {
|
|
19
|
+
if (assistantId === "")
|
|
19
20
|
assistantId = `resumed-${newSessionId()}`;
|
|
20
21
|
assistantBuffer += e.delta;
|
|
21
22
|
const last = out[out.length - 1];
|
|
22
|
-
if (last && last.role ===
|
|
23
|
+
if (last && last.role === "assistant" && last.id === assistantId) {
|
|
23
24
|
out[out.length - 1] = { ...last, content: assistantBuffer };
|
|
24
25
|
}
|
|
25
26
|
else {
|
|
26
|
-
out.push({
|
|
27
|
+
out.push({
|
|
28
|
+
id: assistantId,
|
|
29
|
+
role: "assistant",
|
|
30
|
+
content: assistantBuffer,
|
|
31
|
+
ts: e.ts,
|
|
32
|
+
});
|
|
27
33
|
}
|
|
28
34
|
}
|
|
29
|
-
else if (e.type ===
|
|
35
|
+
else if (e.type === "message_end") {
|
|
30
36
|
// Message boundary: the next streamed message gets its own bubble,
|
|
31
37
|
// matching the live UI (which finalizes on message_end).
|
|
32
|
-
assistantBuffer =
|
|
33
|
-
assistantId =
|
|
38
|
+
assistantBuffer = "";
|
|
39
|
+
assistantId = "";
|
|
34
40
|
}
|
|
35
|
-
else if (e.type ===
|
|
41
|
+
else if (e.type === "tool_execution_start") {
|
|
36
42
|
// v0.4.3 audit fix: the v3-W event schema renamed `tool_call` →
|
|
37
43
|
// `tool_execution_start` and added the `args` field. The old branches
|
|
38
44
|
// here silently dropped every tool invocation during session resume.
|
|
39
45
|
// v0.6.2: restored as a `role: 'tool'` message so the resumed
|
|
40
46
|
// transcript renders the tool box, same as the live UI.
|
|
41
|
-
assistantBuffer =
|
|
42
|
-
assistantId =
|
|
43
|
-
const argsPreview =
|
|
47
|
+
assistantBuffer = "";
|
|
48
|
+
assistantId = "";
|
|
49
|
+
const argsPreview = formatToolSummary(e.toolName, e.args, 120);
|
|
44
50
|
out.push({
|
|
45
51
|
id: crypto.randomUUID(),
|
|
46
|
-
role:
|
|
52
|
+
role: "tool",
|
|
47
53
|
content: argsPreview,
|
|
48
54
|
ts: e.ts,
|
|
49
55
|
toolName: e.toolName,
|
|
50
56
|
toolCallId: e.toolCallId,
|
|
51
57
|
});
|
|
52
58
|
}
|
|
53
|
-
else if (e.type ===
|
|
59
|
+
else if (e.type === "tool_execution_end") {
|
|
54
60
|
// v0.6.2: update the matching start message in place (the event does
|
|
55
61
|
// NOT carry toolName — the old code rendered "[tool_result] undefined").
|
|
56
62
|
const end = e;
|
|
57
63
|
let matched = false;
|
|
58
64
|
for (let i = out.length - 1; i >= 0; i--) {
|
|
59
65
|
const m = out[i];
|
|
60
|
-
if (m.role ===
|
|
66
|
+
if (m.role === "tool" &&
|
|
67
|
+
m.toolCallId === end.toolCallId &&
|
|
68
|
+
m.toolDurationMs === undefined) {
|
|
61
69
|
// v0.6.2 audit LOW-5: append `…` on truncation to match the
|
|
62
70
|
// live path (messageHelpers.appendToolEnd behavior).
|
|
63
|
-
const raw = typeof end.result ===
|
|
64
|
-
const truncated = raw.length > 600 ? `${raw.slice(0, 600)}…` : raw;
|
|
71
|
+
const raw = typeof end.result === "string" ? end.result : "";
|
|
65
72
|
out[i] = {
|
|
66
73
|
...m,
|
|
67
74
|
toolOk: !end.isError,
|
|
68
75
|
toolDurationMs: end.durationMs,
|
|
69
|
-
...(raw.length > 0
|
|
76
|
+
...(raw.length > 0
|
|
77
|
+
? {
|
|
78
|
+
toolResult: toolResultForStorage(m.toolName ?? "", raw, end.isError),
|
|
79
|
+
}
|
|
80
|
+
: {}),
|
|
70
81
|
};
|
|
71
82
|
matched = true;
|
|
72
83
|
break;
|
|
@@ -75,32 +86,32 @@ export function eventsToMessages(events) {
|
|
|
75
86
|
if (!matched) {
|
|
76
87
|
out.push({
|
|
77
88
|
id: crypto.randomUUID(),
|
|
78
|
-
role:
|
|
79
|
-
content: `[tool_result] ${end.toolCallId} → ${end.isError ?
|
|
89
|
+
role: "system",
|
|
90
|
+
content: `[tool_result] ${end.toolCallId} → ${end.isError ? "error" : "ok"}`,
|
|
80
91
|
ts: e.ts,
|
|
81
92
|
});
|
|
82
93
|
}
|
|
83
94
|
}
|
|
84
|
-
else if (e.type ===
|
|
95
|
+
else if (e.type === "agent_start") {
|
|
85
96
|
out.push({
|
|
86
97
|
id: crypto.randomUUID(),
|
|
87
|
-
role:
|
|
98
|
+
role: "system",
|
|
88
99
|
content: `[agent_start] model=${e.model} provider=${e.provider}`,
|
|
89
100
|
ts: e.ts,
|
|
90
101
|
});
|
|
91
102
|
}
|
|
92
|
-
else if (e.type ===
|
|
103
|
+
else if (e.type === "agent_end") {
|
|
93
104
|
out.push({
|
|
94
105
|
id: crypto.randomUUID(),
|
|
95
|
-
role:
|
|
106
|
+
role: "system",
|
|
96
107
|
content: `[agent_end] reason=${e.reason} duration=${e.durationMs}ms`,
|
|
97
108
|
ts: e.ts,
|
|
98
109
|
});
|
|
99
110
|
}
|
|
100
|
-
else if (e.type ===
|
|
111
|
+
else if (e.type === "error") {
|
|
101
112
|
out.push({
|
|
102
113
|
id: crypto.randomUUID(),
|
|
103
|
-
role:
|
|
114
|
+
role: "system",
|
|
104
115
|
content: `[error] ${e.message}`,
|
|
105
116
|
ts: e.ts,
|
|
106
117
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventsToMessages.js","sourceRoot":"","sources":["../../../src/cli/hooks/eventsToMessages.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD;;;;;;;;;GASG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAA6B;IAC5D,MAAM,GAAG,GAAkB,EAAE,CAAC;IAC9B,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,IAAI,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAC/B,IAAI,WAAW,KAAK,EAAE;gBAAE,WAAW,GAAG,WAAW,YAAY,EAAE,EAAE,CAAC;YAClE,eAAe,IAAI,CAAC,CAAC,KAAK,CAAC;YAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACjC,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,EAAE,KAAK,WAAW,EAAE,CAAC;gBACjE,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"eventsToMessages.js","sourceRoot":"","sources":["../../../src/cli/hooks/eventsToMessages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { formatToolSummary } from
|
|
1
|
+
import { formatToolSummary, toolResultForStorage, } from "../components/toolFormat.js";
|
|
2
2
|
/**
|
|
3
3
|
* Helpers for building ChatMessage instances in the most common shapes.
|
|
4
4
|
*
|
|
@@ -16,14 +16,14 @@ import { formatToolSummary } from '../components/toolFormat.js';
|
|
|
16
16
|
export function appendSystem(setMessages, content, ts = Date.now()) {
|
|
17
17
|
setMessages((prev) => [
|
|
18
18
|
...prev,
|
|
19
|
-
{ id: crypto.randomUUID(), role:
|
|
19
|
+
{ id: crypto.randomUUID(), role: "system", content, ts },
|
|
20
20
|
]);
|
|
21
21
|
}
|
|
22
22
|
/** Append a user message (the user's submitted prompt). */
|
|
23
23
|
export function appendUser(setMessages, content, ts = Date.now()) {
|
|
24
24
|
setMessages((prev) => [
|
|
25
25
|
...prev,
|
|
26
|
-
{ id: crypto.randomUUID(), role:
|
|
26
|
+
{ id: crypto.randomUUID(), role: "user", content, ts },
|
|
27
27
|
]);
|
|
28
28
|
}
|
|
29
29
|
/**
|
|
@@ -38,18 +38,22 @@ export function appendUser(setMessages, content, ts = Date.now()) {
|
|
|
38
38
|
export function appendOrExtendStreamingAssistant(setMessages, fullContent, ts, memberContext) {
|
|
39
39
|
setMessages((prev) => {
|
|
40
40
|
const last = prev[prev.length - 1];
|
|
41
|
-
if (last && last.role ===
|
|
41
|
+
if (last && last.role === "assistant" && last.id.startsWith("streaming-")) {
|
|
42
42
|
return [...prev.slice(0, -1), { ...last, content: fullContent }];
|
|
43
43
|
}
|
|
44
44
|
return [
|
|
45
45
|
...prev,
|
|
46
46
|
{
|
|
47
47
|
id: `streaming-${crypto.randomUUID()}`,
|
|
48
|
-
role:
|
|
48
|
+
role: "assistant",
|
|
49
49
|
content: fullContent,
|
|
50
50
|
ts,
|
|
51
|
-
...(memberContext?.memberId
|
|
52
|
-
|
|
51
|
+
...(memberContext?.memberId
|
|
52
|
+
? { memberId: memberContext.memberId }
|
|
53
|
+
: {}),
|
|
54
|
+
...(memberContext?.memberName
|
|
55
|
+
? { memberName: memberContext.memberName }
|
|
56
|
+
: {}),
|
|
53
57
|
},
|
|
54
58
|
];
|
|
55
59
|
});
|
|
@@ -59,7 +63,7 @@ export function appendOrExtendStreamingAssistant(setMessages, fullContent, ts, m
|
|
|
59
63
|
* match chatState.ts — the 600-char cut chopped the JSON envelope before
|
|
60
64
|
* formatToolResult could parse it, forcing the raw-escaped fallback.
|
|
61
65
|
*/
|
|
62
|
-
export
|
|
66
|
+
export { TOOL_RESULT_PREVIEW_CHARS } from "../components/toolFormat.js";
|
|
63
67
|
/** Max chars of the JSON args preview shown on the tool summary line. */
|
|
64
68
|
export const TOOL_ARGS_PREVIEW_CHARS = 120;
|
|
65
69
|
/**
|
|
@@ -75,7 +79,7 @@ export function appendToolStart(setMessages, toolName, toolCallId, args, ts) {
|
|
|
75
79
|
...prev,
|
|
76
80
|
{
|
|
77
81
|
id: crypto.randomUUID(),
|
|
78
|
-
role:
|
|
82
|
+
role: "tool",
|
|
79
83
|
content: argsPreview,
|
|
80
84
|
ts,
|
|
81
85
|
toolName,
|
|
@@ -94,7 +98,10 @@ export function updateToolMessageEnd(setMessages, toolCallId, isError, durationM
|
|
|
94
98
|
setMessages((prev) => {
|
|
95
99
|
for (let i = prev.length - 1; i >= 0; i--) {
|
|
96
100
|
const m = prev[i];
|
|
97
|
-
if (m &&
|
|
101
|
+
if (m &&
|
|
102
|
+
m.role === "tool" &&
|
|
103
|
+
m.toolCallId === toolCallId &&
|
|
104
|
+
m.toolDurationMs === undefined) {
|
|
98
105
|
const updated = [...prev];
|
|
99
106
|
updated[i] = {
|
|
100
107
|
...m,
|
|
@@ -102,9 +109,7 @@ export function updateToolMessageEnd(setMessages, toolCallId, isError, durationM
|
|
|
102
109
|
toolDurationMs: durationMs,
|
|
103
110
|
...(result !== undefined
|
|
104
111
|
? {
|
|
105
|
-
toolResult:
|
|
106
|
-
? `${result.slice(0, TOOL_RESULT_PREVIEW_CHARS)}…`
|
|
107
|
-
: result,
|
|
112
|
+
toolResult: toolResultForStorage(m.toolName ?? "", result, isError),
|
|
108
113
|
}
|
|
109
114
|
: {}),
|
|
110
115
|
};
|
|
@@ -123,8 +128,11 @@ export function updateToolMessageEnd(setMessages, toolCallId, isError, durationM
|
|
|
123
128
|
export function finalizeStreamingAssistant(setMessages) {
|
|
124
129
|
setMessages((prev) => {
|
|
125
130
|
const last = prev[prev.length - 1];
|
|
126
|
-
if (last && last.role ===
|
|
127
|
-
return [
|
|
131
|
+
if (last && last.role === "assistant" && last.id.startsWith("streaming-")) {
|
|
132
|
+
return [
|
|
133
|
+
...prev.slice(0, -1),
|
|
134
|
+
{ ...last, id: last.id.slice("streaming-".length) },
|
|
135
|
+
];
|
|
128
136
|
}
|
|
129
137
|
return prev;
|
|
130
138
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messageHelpers.js","sourceRoot":"","sources":["../../../src/cli/hooks/messageHelpers.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"messageHelpers.js","sourceRoot":"","sources":["../../../src/cli/hooks/messageHelpers.ts"],"names":[],"mappings":"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"}
|