@noorm/marie-cli 0.1.13 → 0.1.14
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/cli-new/components/App.js +2 -2
- package/dist/cli-new/components/App.js.map +1 -1
- package/dist/cli-new/components/ChatArea.js +4 -0
- package/dist/cli-new/components/ChatArea.js.map +1 -1
- package/dist/cli-new/components/Header.js +2 -2
- package/dist/cli-new/components/Header.js.map +1 -1
- package/dist/cli-new/components/MessageBubble.js +5 -2
- package/dist/cli-new/components/MessageBubble.js.map +1 -1
- package/dist/cli-new/hooks/useMarie.js +31 -4
- package/dist/cli-new/hooks/useMarie.js.map +1 -1
- package/package.json +1 -1
|
@@ -19,7 +19,7 @@ export const App = ({ workingDir }) => {
|
|
|
19
19
|
const [viewMode, setViewMode] = useState("chat");
|
|
20
20
|
const [showSetup, setShowSetup] = useState(false);
|
|
21
21
|
// Core hooks
|
|
22
|
-
const { messages, isLoading, streamingState, pendingApproval, runElapsedMs, sendMessage, stopGeneration, createSession, loadSession, clearSession, marie, } = useMarie({ workingDir });
|
|
22
|
+
const { messages, isLoading, streamingState, pendingApproval, runElapsedMs, currentThought, sendMessage, stopGeneration, createSession, loadSession, clearSession, marie, } = useMarie({ workingDir });
|
|
23
23
|
const { sessions, currentSessionId, createSession: createNewSession, switchSession, deleteSession, renameSession, togglePinSession, } = useSessions({ marie });
|
|
24
24
|
const { gitStatus, createCheckpoint, undoLastCommit } = useGit({
|
|
25
25
|
workingDir,
|
|
@@ -134,6 +134,6 @@ export const App = ({ workingDir }) => {
|
|
|
134
134
|
}, onDelete: deleteSession, onRename: renameSession, onTogglePin: togglePinSession, onClose: () => setViewMode("chat") }));
|
|
135
135
|
}
|
|
136
136
|
const { stdout } = useStdout();
|
|
137
|
-
return (_jsxs(Box, { flexDirection: "column", height: stdout?.rows || 24, children: [_jsx(Header, { model: model, sessionTitle: sessionTitle, gitStatus: gitStatus || undefined, isLoading: isLoading, elapsedMs: runElapsedMs, autonomyMode: autonomyMode }), pendingApproval && _jsx(ApprovalDialog, { request: pendingApproval }), messages.length === 0 && !isLoading && _jsx(Banner, {}), _jsx(ChatArea, { messages: messages, streamingState: streamingState }), _jsx(InputArea, { onSubmit: handleSubmit, isLoading: isLoading }), _jsx(Box, { marginTop: 0, children: _jsx(Text, { color: marieTheme.colors.muted, dimColor: true, italic: true, children: "Ctrl+C Cancel \u2022 Ctrl+S Sessions \u2022 Ctrl+N New \u2022 /autonomy [balanced|high|ascension] \u2022 /config Settings \u2022 /help" }) })] }));
|
|
137
|
+
return (_jsxs(Box, { flexDirection: "column", height: stdout?.rows || 24, children: [_jsx(Header, { model: model, sessionTitle: sessionTitle, gitStatus: gitStatus || undefined, isLoading: isLoading, elapsedMs: runElapsedMs, autonomyMode: autonomyMode, currentThought: currentThought }), pendingApproval && _jsx(ApprovalDialog, { request: pendingApproval }), messages.length === 0 && !isLoading && _jsx(Banner, {}), _jsx(ChatArea, { messages: messages, streamingState: streamingState }), _jsx(InputArea, { onSubmit: handleSubmit, isLoading: isLoading }), _jsx(Box, { marginTop: 0, children: _jsx(Text, { color: marieTheme.colors.muted, dimColor: true, italic: true, children: "Ctrl+C Cancel \u2022 Ctrl+S Sessions \u2022 Ctrl+N New \u2022 /autonomy [balanced|high|ascension] \u2022 /config Settings \u2022 /help" }) })] }));
|
|
138
138
|
};
|
|
139
139
|
//# sourceMappingURL=App.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/cli-new/components/App.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/cli-new/components/App.tsx"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,7 @@ export const ChatArea = ({ messages, streamingState, }) => {
|
|
|
36
36
|
index === visibleMessages.length - 1 &&
|
|
37
37
|
message.role === "assistant" }, message.id))), streamingState.isActive &&
|
|
38
38
|
(streamingState.content ||
|
|
39
|
+
streamingState.toolStreamingBuffer ||
|
|
39
40
|
(streamingState.toolCalls &&
|
|
40
41
|
streamingState.toolCalls.length > 0)) && (_jsx(MessageBubble, { message: {
|
|
41
42
|
id: "streaming",
|
|
@@ -44,6 +45,9 @@ export const ChatArea = ({ messages, streamingState, }) => {
|
|
|
44
45
|
timestamp: stableTimestamp,
|
|
45
46
|
isStreaming: true,
|
|
46
47
|
toolCalls: streamingState.toolCalls,
|
|
48
|
+
toolStreamingBuffer: streamingState.toolStreamingBuffer,
|
|
49
|
+
activeToolName: streamingState.activeToolName,
|
|
50
|
+
activeFilePath: streamingState.activeFilePath,
|
|
47
51
|
}, isStreaming: true }))] }));
|
|
48
52
|
};
|
|
49
53
|
//# sourceMappingURL=ChatArea.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatArea.js","sourceRoot":"","sources":["../../../src/cli-new/components/ChatArea.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ChatArea.js","sourceRoot":"","sources":["../../../src/cli-new/components/ChatArea.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ function formatElapsed(ms) {
|
|
|
7
7
|
const seconds = totalSeconds % 60;
|
|
8
8
|
return `${minutes}:${seconds.toString().padStart(2, "0")}`;
|
|
9
9
|
}
|
|
10
|
-
export const Header = ({ model, sessionTitle, gitStatus, isLoading, elapsedMs = 0, autonomyMode = "ascension", }) => {
|
|
10
|
+
export const Header = ({ model, sessionTitle, gitStatus, isLoading, elapsedMs = 0, autonomyMode = "ascension", currentThought = "", }) => {
|
|
11
11
|
const formatModelName = (m) => {
|
|
12
12
|
if (m.includes("claude"))
|
|
13
13
|
return "Claude";
|
|
@@ -15,6 +15,6 @@ export const Header = ({ model, sessionTitle, gitStatus, isLoading, elapsedMs =
|
|
|
15
15
|
return "GPT";
|
|
16
16
|
return m;
|
|
17
17
|
};
|
|
18
|
-
return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: marieTheme.colors.primary, paddingX: 1, marginBottom: 0, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { children: [_jsxs(Text, { color: marieTheme.colors.primary, bold: true, children: [marieTheme.icons.assistant, " Marie"] }), _jsx(Text, { color: marieTheme.colors.muted, children: " v0.2.0" })] }), _jsxs(Box, { gap: 2, children: [isLoading && (_jsxs(Text, { color: marieTheme.colors.warning, children: [marieTheme.icons.spinner, " ", formatElapsed(elapsedMs)] })), _jsx(Text, { color: marieTheme.colors.secondary, children: formatModelName(model) }), _jsx(Text, { color: marieTheme.colors.muted, children: autonomyMode === "ascension" ? "ASC" : autonomyMode.toUpperCase() })] })] }), _jsxs(Box, { justifyContent: "space-between", marginTop: 0, children: [_jsx(Text, { color: marieTheme.colors.foreground, bold: true, children: sessionTitle }), gitStatus && (_jsxs(Box, { gap: 1, children: [_jsxs(Text, { color: marieTheme.colors.info, children: [marieTheme.icons.git, " ", gitStatus.branch] }), !gitStatus.isClean && (_jsxs(Text, { color: marieTheme.colors.warning, children: ["*", gitStatus.modified.length + gitStatus.staged.length] }))] }))] })] }));
|
|
18
|
+
return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: marieTheme.colors.primary, paddingX: 1, marginBottom: 0, children: [_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { children: [_jsxs(Text, { color: marieTheme.colors.primary, bold: true, children: [marieTheme.icons.assistant, " Marie"] }), _jsx(Text, { color: marieTheme.colors.muted, children: " v0.2.0" })] }), _jsxs(Box, { gap: 2, children: [isLoading && (_jsxs(Text, { color: marieTheme.colors.warning, children: [marieTheme.icons.spinner, " ", formatElapsed(elapsedMs)] })), _jsx(Text, { color: marieTheme.colors.secondary, children: formatModelName(model) }), _jsx(Text, { color: marieTheme.colors.muted, children: autonomyMode === "ascension" ? "ASC" : autonomyMode.toUpperCase() })] })] }), currentThought && isLoading && (_jsx(Box, { marginTop: 0, children: _jsxs(Text, { color: marieTheme.colors.info, italic: true, dimColor: true, children: ["\uD83D\uDCAD ", currentThought.length > 80 ? currentThought.substring(0, 77) + "..." : currentThought] }) }))] }), _jsxs(Box, { justifyContent: "space-between", marginTop: 0, children: [_jsx(Text, { color: marieTheme.colors.foreground, bold: true, children: sessionTitle }), gitStatus && (_jsxs(Box, { gap: 1, children: [_jsxs(Text, { color: marieTheme.colors.info, children: [marieTheme.icons.git, " ", gitStatus.branch] }), !gitStatus.isClean && (_jsxs(Text, { color: marieTheme.colors.warning, children: ["*", gitStatus.modified.length + gitStatus.staged.length] }))] }))] })] }));
|
|
19
19
|
};
|
|
20
20
|
//# sourceMappingURL=Header.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/cli-new/components/Header.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/cli-new/components/Header.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAahD,SAAS,aAAa,CAAC,EAAU;IAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,YAAY,GAAG,EAAE,CAAC;IAClC,OAAO,GAAG,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;AAC7D,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAA0B,CAAC,EAC5C,KAAK,EACL,YAAY,EACZ,SAAS,EACT,SAAS,EACT,SAAS,GAAG,CAAC,EACb,YAAY,GAAG,WAAW,EAC1B,cAAc,GAAG,EAAE,GACpB,EAAE,EAAE;IACH,MAAM,eAAe,GAAG,CAAC,CAAS,EAAE,EAAE;QACpC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAC;QAC1C,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACpC,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;IAEF,OAAO,CACL,MAAC,GAAG,IACF,aAAa,EAAC,QAAQ,EACtB,WAAW,EAAC,QAAQ,EACpB,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,EACtC,QAAQ,EAAE,CAAC,EACX,YAAY,EAAE,CAAC,aAEf,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,MAAC,GAAG,IAAC,cAAc,EAAC,eAAe,aACjC,MAAC,GAAG,eACF,MAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,mBACzC,UAAU,CAAC,KAAK,CAAC,SAAS,cACtB,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,KAAK,wBAAgB,IAChD,EACN,MAAC,GAAG,IAAC,GAAG,EAAE,CAAC,aACR,SAAS,IAAI,CACZ,MAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,aACnC,UAAU,CAAC,KAAK,CAAC,OAAO,OAAG,aAAa,CAAC,SAAS,CAAC,IAC/C,CACR,EACD,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,SAAS,YACrC,eAAe,CAAC,KAAK,CAAC,GAClB,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,KAAK,YACjC,YAAY,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,EAAE,GAC7D,IACH,IACF,EAEL,cAAc,IAAI,SAAS,IAAI,CAC9B,KAAC,GAAG,IAAC,SAAS,EAAE,CAAC,YACf,MAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,QAAC,QAAQ,oCAC9C,cAAc,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,cAAc,IACpF,GACH,CACP,IACG,EAEN,MAAC,GAAG,IAAC,cAAc,EAAC,eAAe,EAAC,SAAS,EAAE,CAAC,aAC9C,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,kBAC5C,YAAY,GACR,EACN,SAAS,IAAI,CACZ,MAAC,GAAG,IAAC,GAAG,EAAE,CAAC,aACT,MAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,aAChC,UAAU,CAAC,KAAK,CAAC,GAAG,OAAG,SAAS,CAAC,MAAM,IACnC,EACN,CAAC,SAAS,CAAC,OAAO,IAAI,CACrB,MAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,kBAClC,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,IAChD,CACR,IACG,CACP,IACG,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -101,14 +101,17 @@ export const MessageBubble = ({ message, isStreaming, showTimestamp = true, }) =
|
|
|
101
101
|
const wrappedLines = wrapText(message.content, maxWidth - 2);
|
|
102
102
|
return (_jsxs(Box, { flexDirection: "column", marginTop: 0, marginBottom: 0, paddingX: 1, children: [_jsxs(Box, { children: [_jsxs(Text, { bold: true, color: marieTheme.colors.primary, children: [marieTheme.icons.user, " You"] }), showTimestamp && (_jsxs(Text, { color: marieTheme.colors.muted, dimColor: true, children: [" ", timeStr] })), _jsx(Text, { color: marieTheme.colors.primary, children: " \u203A " }), _jsx(Text, { color: marieTheme.colors.foreground, children: wrappedLines[0] || "" })] }), wrappedLines.slice(1).map((line, i) => (_jsx(Box, { marginLeft: 4, children: _jsx(Text, { color: marieTheme.colors.foreground, children: line || " " }) }, i)))] }));
|
|
103
103
|
}
|
|
104
|
-
|
|
104
|
+
const streamingToolName = message.activeToolName;
|
|
105
|
+
const streamingToolBuffer = message.toolStreamingBuffer;
|
|
106
|
+
const activeFilePath = message.activeFilePath;
|
|
107
|
+
return (_jsxs(Box, { flexDirection: "column", marginTop: 0, marginBottom: 0, paddingX: 1, borderStyle: "round", borderColor: marieTheme.colors.secondary, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { children: [_jsxs(Text, { bold: true, color: marieTheme.colors.success, children: [marieTheme.icons.assistant, " Marie"] }), isStreaming && (_jsxs(Text, { color: marieTheme.colors.muted, children: [" ", marieTheme.icons.spinner] })), activeFilePath && (_jsxs(Text, { color: marieTheme.colors.info, dimColor: true, children: [" ", marieTheme.icons.file, " ", activeFilePath] }))] }), showTimestamp && (_jsx(Text, { color: marieTheme.colors.muted, dimColor: true, children: timeStr }))] }), _jsxs(Box, { flexDirection: "column", marginLeft: 0, children: [contentParts.map((part, partIndex) => {
|
|
105
108
|
if (part.type === "code") {
|
|
106
109
|
const codeLines = wrapText(part.content, maxWidth - 4);
|
|
107
110
|
return (_jsxs(Box, { flexDirection: "column", marginY: 1, paddingX: 1, borderStyle: "single", borderColor: marieTheme.colors.muted, children: [part.language && (_jsx(Text, { color: marieTheme.colors.info, dimColor: true, children: part.language })), codeLines.map((line, i) => (_jsx(Text, { color: marieTheme.colors.foreground, children: line || " " }, i)))] }, partIndex));
|
|
108
111
|
}
|
|
109
112
|
const textLines = wrapText(part.content, maxWidth - 2);
|
|
110
113
|
return textLines.map((line, i) => (_jsx(Text, { color: marieTheme.colors.foreground, children: line || " " }, `${partIndex}-${i}`)));
|
|
111
|
-
}), isStreaming && _jsx(Text, { color: marieTheme.colors.primary, children: "\u258A" })] }), message.toolCalls &&
|
|
114
|
+
}), isStreaming && !streamingToolBuffer && (_jsx(Text, { color: marieTheme.colors.primary, children: "\u258A" })), isStreaming && streamingToolBuffer && (_jsxs(Box, { flexDirection: "column", marginY: 1, paddingX: 1, borderStyle: "single", borderColor: marieTheme.colors.warning, children: [_jsxs(Box, { children: [_jsxs(Text, { color: marieTheme.colors.warning, children: [marieTheme.icons.tool, " ", streamingToolName || "Executing Technique..."] }), _jsxs(Text, { color: marieTheme.colors.muted, children: [" ", marieTheme.icons.spinner] })] }), _jsx(Text, { color: marieTheme.colors.muted, children: streamingToolBuffer.slice(-200) })] }))] }), message.toolCalls &&
|
|
112
115
|
message.toolCalls.map((tool) => (_jsx(ToolCallDisplay, { tool: tool }, tool.id)))] }));
|
|
113
116
|
};
|
|
114
117
|
//# sourceMappingURL=MessageBubble.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MessageBubble.js","sourceRoot":"","sources":["../../../src/cli-new/components/MessageBubble.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MessageBubble.js","sourceRoot":"","sources":["../../../src/cli-new/components/MessageBubble.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export function useMarie(options) {
|
|
|
10
10
|
});
|
|
11
11
|
const [currentRun, setCurrentRun] = useState(null);
|
|
12
12
|
const [runElapsedMs, setRunElapsedMs] = useState(0);
|
|
13
|
+
const [currentThought, setCurrentThought] = useState("");
|
|
13
14
|
const currentToolCallsRef = useRef([]);
|
|
14
15
|
const upsertToolCall = useCallback((nextTool) => {
|
|
15
16
|
const existing = currentToolCallsRef.current;
|
|
@@ -91,6 +92,7 @@ export function useMarie(options) {
|
|
|
91
92
|
setMessages((prev) => [...prev, userMessage]);
|
|
92
93
|
setIsLoading(true);
|
|
93
94
|
currentToolCallsRef.current = [];
|
|
95
|
+
setCurrentThought("");
|
|
94
96
|
setStreamingState({ isActive: true, content: "", toolCalls: [] });
|
|
95
97
|
const callbacks = {
|
|
96
98
|
onStream: (chunk) => {
|
|
@@ -109,6 +111,7 @@ export function useMarie(options) {
|
|
|
109
111
|
setStreamingState((prev) => ({
|
|
110
112
|
...prev,
|
|
111
113
|
toolCall,
|
|
114
|
+
toolStreamingBuffer: "", // Clear buffer when a formal tool call starts
|
|
112
115
|
toolCalls: [
|
|
113
116
|
...(prev.toolCalls || []).filter((t) => t.id !== toolCall.id),
|
|
114
117
|
toolCall,
|
|
@@ -117,16 +120,37 @@ export function useMarie(options) {
|
|
|
117
120
|
upsertToolCall(toolCall);
|
|
118
121
|
},
|
|
119
122
|
onToolDelta: (delta) => {
|
|
120
|
-
|
|
123
|
+
setStreamingState((prev) => ({
|
|
124
|
+
...prev,
|
|
125
|
+
toolStreamingBuffer: (prev.toolStreamingBuffer || "") + (delta.inputDelta || ""),
|
|
126
|
+
activeToolName: delta.name || prev.activeToolName,
|
|
127
|
+
}));
|
|
121
128
|
},
|
|
122
129
|
onEvent: (event) => {
|
|
123
130
|
if (event.type === "run_started") {
|
|
124
131
|
setCurrentRun(event);
|
|
125
132
|
setRunElapsedMs(0);
|
|
126
133
|
}
|
|
127
|
-
else if (event.type === "progress_update"
|
|
128
|
-
typeof event.elapsedMs === "number") {
|
|
129
|
-
|
|
134
|
+
else if (event.type === "progress_update") {
|
|
135
|
+
if (typeof event.elapsedMs === "number") {
|
|
136
|
+
setRunElapsedMs(event.elapsedMs);
|
|
137
|
+
}
|
|
138
|
+
if (event.activeFilePath) {
|
|
139
|
+
setStreamingState((prev) => ({
|
|
140
|
+
...prev,
|
|
141
|
+
activeFilePath: event.activeFilePath,
|
|
142
|
+
}));
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
else if (event.type === "tool_delta") {
|
|
146
|
+
setStreamingState((prev) => ({
|
|
147
|
+
...prev,
|
|
148
|
+
toolStreamingBuffer: (prev.toolStreamingBuffer || "") + (event.inputDelta || ""),
|
|
149
|
+
activeToolName: event.name || prev.activeToolName,
|
|
150
|
+
}));
|
|
151
|
+
}
|
|
152
|
+
else if (event.type === "reasoning") {
|
|
153
|
+
setCurrentThought(event.text || "");
|
|
130
154
|
}
|
|
131
155
|
else if (event.type === "tool") {
|
|
132
156
|
const phase = event.phase;
|
|
@@ -202,6 +226,7 @@ export function useMarie(options) {
|
|
|
202
226
|
currentToolCallsRef.current = [];
|
|
203
227
|
setCurrentRun(null);
|
|
204
228
|
setRunElapsedMs(0);
|
|
229
|
+
setCurrentThought("");
|
|
205
230
|
}
|
|
206
231
|
}, [isLoading, upsertToolCall]);
|
|
207
232
|
const stopGeneration = useCallback(() => {
|
|
@@ -211,6 +236,7 @@ export function useMarie(options) {
|
|
|
211
236
|
currentToolCallsRef.current = [];
|
|
212
237
|
setCurrentRun(null);
|
|
213
238
|
setRunElapsedMs(0);
|
|
239
|
+
setCurrentThought("");
|
|
214
240
|
}, []);
|
|
215
241
|
const createSession = useCallback(async () => {
|
|
216
242
|
const id = await marieRef.current?.createSession();
|
|
@@ -238,6 +264,7 @@ export function useMarie(options) {
|
|
|
238
264
|
currentRun,
|
|
239
265
|
pendingApproval: null, // TODO: Implement approval state if needed
|
|
240
266
|
runElapsedMs,
|
|
267
|
+
currentThought,
|
|
241
268
|
sendMessage,
|
|
242
269
|
stopGeneration,
|
|
243
270
|
createSession,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMarie.js","sourceRoot":"","sources":["../../../src/cli-new/hooks/useMarie.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"useMarie.js","sourceRoot":"","sources":["../../../src/cli-new/hooks/useMarie.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED