locdotech-ai 1.0.46 → 1.0.48
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/api/streaming.d.ts.map +1 -1
- package/dist/api/streaming.js +1 -8
- package/dist/api/streaming.js.map +1 -1
- package/dist/cli.js +1 -1
- package/dist/ui/App.js +1 -1
- package/dist/ui/hooks/chat/useToolExecution.d.ts.map +1 -1
- package/dist/ui/hooks/chat/useToolExecution.js +17 -20
- package/dist/ui/hooks/chat/useToolExecution.js.map +1 -1
- package/dist/ui/hooks/useAppEffects.d.ts +1 -1
- package/dist/ui/hooks/useAppEffects.d.ts.map +1 -1
- package/dist/ui/hooks/useAppEffects.js +8 -5
- package/dist/ui/hooks/useAppEffects.js.map +1 -1
- package/dist/ui/hooks/useChat.d.ts.map +1 -1
- package/dist/ui/hooks/useChat.js +12 -3
- package/dist/ui/hooks/useChat.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../../src/api/streaming.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAU,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAErE,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,SAAS,GAAG,WAAW,GAAG,MAAM,GAAG,OAAO,CAAC;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IAChD,OAAO,CAAC,eAAe,CAAgC;IAEjD,MAAM,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../../src/api/streaming.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAU,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAErE,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,SAAS,GAAG,WAAW,GAAG,MAAM,GAAG,OAAO,CAAC;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IAChD,OAAO,CAAC,eAAe,CAAgC;IAEjD,MAAM,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAiGpD,KAAK,IAAI,IAAI;CAKd;AAED,eAAO,MAAM,gBAAgB,kBAAyB,CAAC"}
|
package/dist/api/streaming.js
CHANGED
|
@@ -56,7 +56,7 @@ export class StreamingHandler extends EventEmitter {
|
|
|
56
56
|
toolCalls.push(currentToolCall);
|
|
57
57
|
currentToolCall = null;
|
|
58
58
|
}
|
|
59
|
-
// Emit all tool calls when stream finishes
|
|
59
|
+
// Emit all tool calls when stream finishes
|
|
60
60
|
if (toolCalls.length > 0) {
|
|
61
61
|
for (const tc of toolCalls) {
|
|
62
62
|
this.emit('tool_call', tc);
|
|
@@ -72,13 +72,6 @@ export class StreamingHandler extends EventEmitter {
|
|
|
72
72
|
this.emit('tool_call', tc);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
|
-
// Debug: Log stream completion
|
|
76
|
-
if (process.env.DEBUG) {
|
|
77
|
-
console.log('[Streaming] Stream done', {
|
|
78
|
-
contentLength: fullContent.length,
|
|
79
|
-
toolCallsCount: toolCalls.length,
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
75
|
this.emit('done');
|
|
83
76
|
const message = {
|
|
84
77
|
role: 'assistant',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../src/api/streaming.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAkC,MAAM,aAAa,CAAC;AASrE,MAAM,OAAO,gBAAiB,SAAQ,YAAY;IACxC,eAAe,GAA2B,IAAI,CAAC;IAEvD,KAAK,CAAC,MAAM,CAAC,OAAoB;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAE7C,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,MAAM,SAAS,GAAe,EAAE,CAAC;QACjC,IAAI,eAAe,GAA6B,IAAI,CAAC;QAErD,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrD,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBACxC,MAAM;gBACR,CAAC;gBAED,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAChC,IAAI,CAAC,MAAM;oBAAE,SAAS;gBAEtB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;gBAE3B,iBAAiB;gBACjB,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;oBAClB,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC;oBAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBACtC,CAAC;gBAED,oBAAoB;gBACpB,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;oBACrB,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;wBAClC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;4BACV,gBAAgB;4BAChB,IAAI,eAAe,IAAI,eAAe,CAAC,EAAE,EAAE,CAAC;gCAC1C,SAAS,CAAC,IAAI,CAAC,eAA2B,CAAC,CAAC;4BAC9C,CAAC;4BACD,eAAe,GAAG;gCAChB,EAAE,EAAE,EAAE,CAAC,EAAE;gCACT,IAAI,EAAE,UAAU;gCAChB,QAAQ,EAAE;oCACR,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE;oCAC7B,SAAS,EAAE,EAAE,CAAC,QAAQ,EAAE,SAAS,IAAI,EAAE;iCACxC;6BACF,CAAC;wBACJ,CAAC;6BAAM,IAAI,eAAe,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;4BAC1C,sCAAsC;4BACtC,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gCACrB,eAAe,CAAC,QAAS,CAAC,IAAI,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACrD,CAAC;4BACD,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;gCAC1B,eAAe,CAAC,QAAS,CAAC,SAAS,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;4BAC/D,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,iDAAiD;gBACjD,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;oBACzB,2CAA2C;oBAC3C,IAAI,eAAe,IAAI,eAAe,CAAC,EAAE,EAAE,CAAC;wBAC1C,SAAS,CAAC,IAAI,CAAC,eAA2B,CAAC,CAAC;wBAC5C,eAAe,GAAG,IAAI,CAAC;oBACzB,CAAC;oBAED,
|
|
1
|
+
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../src/api/streaming.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -5,7 +5,7 @@ export function parseArgs(args = process.argv) {
|
|
|
5
5
|
program
|
|
6
6
|
.name('ai')
|
|
7
7
|
.description('AI Router CLI - Claude Code style AI assistant')
|
|
8
|
-
.version('1.0.
|
|
8
|
+
.version('1.0.47')
|
|
9
9
|
.option('-m, --model <model>', 'Model to use (e.g., songluan, gpt-4)')
|
|
10
10
|
.option('-k, --api-key <key>', 'API key for AIRouter')
|
|
11
11
|
.option('-y, --yes', 'Auto-accept all tool executions')
|
package/dist/ui/App.js
CHANGED
|
@@ -15,7 +15,7 @@ import { useHistory } from './hooks/useHistory.js';
|
|
|
15
15
|
import { useServicesEffect, useToolCallsEffect, useKeyboardShortcuts } from './hooks/useAppEffects.js';
|
|
16
16
|
import { loadSettings, saveSettings } from '../config/index.js';
|
|
17
17
|
import { commandRegistry } from '../commands/index.js';
|
|
18
|
-
const VERSION = '1.0.
|
|
18
|
+
const VERSION = '1.0.48';
|
|
19
19
|
export function App({ initialPrompt }) {
|
|
20
20
|
const { exit } = useApp();
|
|
21
21
|
const settings = loadSettings();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useToolExecution.d.ts","sourceRoot":"","sources":["../../../../src/ui/hooks/chat/useToolExecution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAG1E,UAAU,qBAAqB;IAC7B,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1D,UAAU,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAClD,mBAAmB,EAAE,gBAAgB,CAAC,eAAe,EAAE,CAAC,CAAC;IACzD,qBAAqB,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACjD,qBAAqB,EAAE,gBAAgB,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;CACvE;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,KAAK,EACL,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,GACtB,EAAE,qBAAqB;
|
|
1
|
+
{"version":3,"file":"useToolExecution.d.ts","sourceRoot":"","sources":["../../../../src/ui/hooks/chat/useToolExecution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAG1E,UAAU,qBAAqB;IAC7B,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1D,UAAU,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAClD,mBAAmB,EAAE,gBAAgB,CAAC,eAAe,EAAE,CAAC,CAAC;IACzD,qBAAqB,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACjD,qBAAqB,EAAE,gBAAgB,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;CACvE;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,KAAK,EACL,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,GACtB,EAAE,qBAAqB;kCAuBiC,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kCA4DtB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;iCAW7B,MAAM,KAAG,IAAI;+BAgBX,OAAO,CAAC,IAAI,CAAC;EA2BhE"}
|
|
@@ -6,9 +6,6 @@ export function useToolExecution({ state, setState, addMessage, pendingToolCalls
|
|
|
6
6
|
const checkAndContinue = () => {
|
|
7
7
|
const currentPending = pendingToolCallsRef.current;
|
|
8
8
|
if (isAllToolsHandled(currentPending) && !continueInProgressRef.current) {
|
|
9
|
-
if (process.env.DEBUG) {
|
|
10
|
-
console.log('[useChat] Fallback: triggering continuation');
|
|
11
|
-
}
|
|
12
9
|
continueInProgressRef.current = true;
|
|
13
10
|
const fn = continueAfterToolsRef.current;
|
|
14
11
|
if (fn) {
|
|
@@ -16,6 +13,9 @@ export function useToolExecution({ state, setState, addMessage, pendingToolCalls
|
|
|
16
13
|
continueInProgressRef.current = false;
|
|
17
14
|
});
|
|
18
15
|
}
|
|
16
|
+
else {
|
|
17
|
+
continueInProgressRef.current = false;
|
|
18
|
+
}
|
|
19
19
|
}
|
|
20
20
|
};
|
|
21
21
|
// Multiple checks at different intervals for reliability
|
|
@@ -27,9 +27,6 @@ export function useToolExecution({ state, setState, addMessage, pendingToolCalls
|
|
|
27
27
|
const toolCall = state.pendingToolCalls.find((tc) => tc.id === toolCallId);
|
|
28
28
|
if (!toolCall)
|
|
29
29
|
return;
|
|
30
|
-
if (process.env.DEBUG) {
|
|
31
|
-
console.log('[useChat] Executing tool:', toolCall.name);
|
|
32
|
-
}
|
|
33
30
|
// Update status to executing
|
|
34
31
|
setState((prev) => ({
|
|
35
32
|
...prev,
|
|
@@ -37,16 +34,15 @@ export function useToolExecution({ state, setState, addMessage, pendingToolCalls
|
|
|
37
34
|
}));
|
|
38
35
|
try {
|
|
39
36
|
const result = await toolRegistry.execute(toolCall.name, toolCall.args);
|
|
40
|
-
if (process.env.DEBUG) {
|
|
41
|
-
console.log('[useChat] Tool completed:', toolCall.name);
|
|
42
|
-
}
|
|
43
37
|
// Update status to completed
|
|
44
|
-
setState((prev) =>
|
|
45
|
-
|
|
46
|
-
pendingToolCalls: prev.pendingToolCalls.map((tc) => tc.id === toolCallId
|
|
38
|
+
setState((prev) => {
|
|
39
|
+
const updated = prev.pendingToolCalls.map((tc) => tc.id === toolCallId
|
|
47
40
|
? { ...tc, status: 'completed', result }
|
|
48
|
-
: tc)
|
|
49
|
-
|
|
41
|
+
: tc);
|
|
42
|
+
// Sync ref immediately to avoid stale closure issues
|
|
43
|
+
pendingToolCallsRef.current = updated;
|
|
44
|
+
return { ...prev, pendingToolCalls: updated };
|
|
45
|
+
});
|
|
50
46
|
// Add tool result message
|
|
51
47
|
addMessage({
|
|
52
48
|
role: 'tool',
|
|
@@ -58,12 +54,13 @@ export function useToolExecution({ state, setState, addMessage, pendingToolCalls
|
|
|
58
54
|
}
|
|
59
55
|
catch (error) {
|
|
60
56
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
61
|
-
setState((prev) =>
|
|
62
|
-
|
|
63
|
-
pendingToolCalls: prev.pendingToolCalls.map((tc) => tc.id === toolCallId
|
|
57
|
+
setState((prev) => {
|
|
58
|
+
const updated = prev.pendingToolCalls.map((tc) => tc.id === toolCallId
|
|
64
59
|
? { ...tc, status: 'error', error: errorMessage }
|
|
65
|
-
: tc)
|
|
66
|
-
|
|
60
|
+
: tc);
|
|
61
|
+
pendingToolCallsRef.current = updated;
|
|
62
|
+
return { ...prev, pendingToolCalls: updated };
|
|
63
|
+
});
|
|
67
64
|
addMessage({
|
|
68
65
|
role: 'tool',
|
|
69
66
|
content: JSON.stringify({ error: errorMessage }),
|
|
@@ -72,7 +69,7 @@ export function useToolExecution({ state, setState, addMessage, pendingToolCalls
|
|
|
72
69
|
});
|
|
73
70
|
scheduleContinuationCheck();
|
|
74
71
|
}
|
|
75
|
-
}, [state.pendingToolCalls, setState, addMessage, scheduleContinuationCheck]);
|
|
72
|
+
}, [state.pendingToolCalls, setState, addMessage, scheduleContinuationCheck, pendingToolCallsRef]);
|
|
76
73
|
const approveToolCall = useCallback(async (toolCallId) => {
|
|
77
74
|
setState((prev) => ({
|
|
78
75
|
...prev,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useToolExecution.js","sourceRoot":"","sources":["../../../../src/ui/hooks/chat/useToolExecution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAoB,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAWpD,MAAM,UAAU,gBAAgB,CAAC,EAC/B,KAAK,EACL,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,GACC;IACtB,MAAM,yBAAyB,GAAG,WAAW,CAAC,GAAG,EAAE;QACjD,MAAM,gBAAgB,GAAG,GAAG,EAAE;YAC5B,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC;YACnD,IAAI,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;gBACxE,
|
|
1
|
+
{"version":3,"file":"useToolExecution.js","sourceRoot":"","sources":["../../../../src/ui/hooks/chat/useToolExecution.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ interface UseToolCallsEffectProps {
|
|
|
16
16
|
approveToolCall: (id: string) => Promise<void>;
|
|
17
17
|
setCurrentPermission: React.Dispatch<React.SetStateAction<PermissionState | null>>;
|
|
18
18
|
}
|
|
19
|
-
export declare function useToolCallsEffect({ pendingToolCalls, isLoading, autoAccept, approveToolCall, setCurrentPermission, }: UseToolCallsEffectProps): void;
|
|
19
|
+
export declare function useToolCallsEffect({ pendingToolCalls, isLoading: _isLoading, autoAccept, approveToolCall, setCurrentPermission, }: UseToolCallsEffectProps): void;
|
|
20
20
|
interface UseKeyboardShortcutsProps {
|
|
21
21
|
showModelSelector: boolean;
|
|
22
22
|
showSessionSelector: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAppEffects.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useAppEffects.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,UAAU,eAAe;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAED,UAAU,sBAAsB;IAC9B,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;CAClE;AAED,wBAAgB,iBAAiB,CAAC,EAAE,WAAW,EAAE,EAAE,sBAAsB,QAiBxE;AAED,UAAU,uBAAuB;IAC/B,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,oBAAoB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;CACpF;AAED,wBAAgB,kBAAkB,CAAC,EACjC,gBAAgB,EAChB,SAAS,
|
|
1
|
+
{"version":3,"file":"useAppEffects.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useAppEffects.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,UAAU,eAAe;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAED,UAAU,sBAAsB;IAC9B,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;CAClE;AAED,wBAAgB,iBAAiB,CAAC,EAAE,WAAW,EAAE,EAAE,sBAAsB,QAiBxE;AAED,UAAU,uBAAuB;IAC/B,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,oBAAoB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;CACpF;AAED,wBAAgB,kBAAkB,CAAC,EACjC,gBAAgB,EAChB,SAAS,EAAE,UAAU,EACrB,UAAU,EACV,eAAe,EACf,oBAAoB,GACrB,EAAE,uBAAuB,QAwBzB;AAED,UAAU,yBAAyB;IACjC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;IAC1C,oBAAoB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACpE,sBAAsB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACtE,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,oBAAoB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IACnF,eAAe,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,wBAAgB,oBAAoB,CAAC,EACnC,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,oBAAoB,EACpB,sBAAsB,EACtB,aAAa,EACb,oBAAoB,EACpB,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,aAAa,EACb,KAAK,EACL,IAAI,GACL,EAAE,yBAAyB,QAyD3B"}
|
|
@@ -19,15 +19,18 @@ export function useServicesEffect({ setServices }) {
|
|
|
19
19
|
return () => clearInterval(interval);
|
|
20
20
|
}, [setServices]);
|
|
21
21
|
}
|
|
22
|
-
export function useToolCallsEffect({ pendingToolCalls, isLoading, autoAccept, approveToolCall, setCurrentPermission, }) {
|
|
22
|
+
export function useToolCallsEffect({ pendingToolCalls, isLoading: _isLoading, autoAccept, approveToolCall, setCurrentPermission, }) {
|
|
23
23
|
useEffect(() => {
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
// Don't block on isLoading - we want to process tool calls as soon as they arrive
|
|
25
|
+
// Tool calls should be processed immediately when detected
|
|
26
26
|
const pendingCall = pendingToolCalls.find((tc) => tc.status === 'pending');
|
|
27
27
|
if (pendingCall) {
|
|
28
28
|
if (autoAccept) {
|
|
29
29
|
setCurrentPermission(null);
|
|
30
|
-
|
|
30
|
+
// Use setTimeout to avoid React state update conflicts during render
|
|
31
|
+
setTimeout(() => {
|
|
32
|
+
approveToolCall(pendingCall.id);
|
|
33
|
+
}, 0);
|
|
31
34
|
}
|
|
32
35
|
else {
|
|
33
36
|
setCurrentPermission({
|
|
@@ -40,7 +43,7 @@ export function useToolCallsEffect({ pendingToolCalls, isLoading, autoAccept, ap
|
|
|
40
43
|
else {
|
|
41
44
|
setCurrentPermission(null);
|
|
42
45
|
}
|
|
43
|
-
}, [pendingToolCalls, autoAccept, approveToolCall,
|
|
46
|
+
}, [pendingToolCalls, autoAccept, approveToolCall, setCurrentPermission]);
|
|
44
47
|
}
|
|
45
48
|
export function useKeyboardShortcuts({ showModelSelector, showSessionSelector, isLoading, isStreaming, autoAccept, currentPermission, setShowModelSelector, setShowSessionSelector, setAutoAccept, setCurrentPermission, approveToolCall, rejectToolCall, approveAllToolCalls, clearMessages, abort, exit, }) {
|
|
46
49
|
useInput((input, key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAppEffects.js","sourceRoot":"","sources":["../../../src/ui/hooks/useAppEffects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAc7D,MAAM,UAAU,iBAAiB,CAAC,EAAE,WAAW,EAA0B;IACvE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,GAAG,EAAE;YAC1B,MAAM,SAAS,GAAG,sBAAsB,EAAE,CAAC;YAC3C,MAAM,WAAW,GAAkB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvD,EAAE,EAAE,CAAC,CAAC,EAAE;gBACR,IAAI,EAAE,CAAC,CAAC,OAAO;gBACf,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,MAAM,EAAE,SAAkB;aAC3B,CAAC,CAAC,CAAC;YACJ,WAAW,CAAC,WAAW,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEF,cAAc,EAAE,CAAC;QACjB,MAAM,QAAQ,GAAG,WAAW,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AACpB,CAAC;AAUD,MAAM,UAAU,kBAAkB,CAAC,EACjC,gBAAgB,EAChB,SAAS,
|
|
1
|
+
{"version":3,"file":"useAppEffects.js","sourceRoot":"","sources":["../../../src/ui/hooks/useAppEffects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAc7D,MAAM,UAAU,iBAAiB,CAAC,EAAE,WAAW,EAA0B;IACvE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,GAAG,EAAE;YAC1B,MAAM,SAAS,GAAG,sBAAsB,EAAE,CAAC;YAC3C,MAAM,WAAW,GAAkB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvD,EAAE,EAAE,CAAC,CAAC,EAAE;gBACR,IAAI,EAAE,CAAC,CAAC,OAAO;gBACf,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,MAAM,EAAE,SAAkB;aAC3B,CAAC,CAAC,CAAC;YACJ,WAAW,CAAC,WAAW,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEF,cAAc,EAAE,CAAC;QACjB,MAAM,QAAQ,GAAG,WAAW,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AACpB,CAAC;AAUD,MAAM,UAAU,kBAAkB,CAAC,EACjC,gBAAgB,EAChB,SAAS,EAAE,UAAU,EACrB,UAAU,EACV,eAAe,EACf,oBAAoB,GACI;IACxB,SAAS,CAAC,GAAG,EAAE;QACb,kFAAkF;QAClF,2DAA2D;QAC3D,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;QAE3E,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,UAAU,EAAE,CAAC;gBACf,oBAAoB,CAAC,IAAI,CAAC,CAAC;gBAC3B,qEAAqE;gBACrE,UAAU,CAAC,GAAG,EAAE;oBACd,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAClC,CAAC,EAAE,CAAC,CAAC,CAAC;YACR,CAAC;iBAAM,CAAC;gBACN,oBAAoB,CAAC;oBACnB,UAAU,EAAE,WAAW,CAAC,EAAE;oBAC1B,QAAQ,EAAE,WAAW,CAAC,IAAI;oBAC1B,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;aAAM,CAAC;YACN,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,eAAe,EAAE,oBAAoB,CAAC,CAAC,CAAC;AAC5E,CAAC;AAqBD,MAAM,UAAU,oBAAoB,CAAC,EACnC,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,oBAAoB,EACpB,sBAAsB,EACtB,aAAa,EACb,oBAAoB,EACpB,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,aAAa,EACb,KAAK,EACL,IAAI,GACsB;IAC1B,QAAQ,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACtB,yBAAyB;QACzB,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,iBAAiB,EAAE,CAAC;gBACtB,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAC5B,OAAO;YACT,CAAC;YACD,IAAI,mBAAmB,EAAE,CAAC;gBACxB,sBAAsB,CAAC,KAAK,CAAC,CAAC;gBAC9B,OAAO;YACT,CAAC;QACH,CAAC;QAED,yBAAyB;QACzB,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YACrB,IAAI,iBAAiB,EAAE,CAAC;gBACtB,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAC5B,OAAO;YACT,CAAC;YACD,IAAI,mBAAmB,EAAE,CAAC;gBACxB,sBAAsB,CAAC,KAAK,CAAC,CAAC;gBAC9B,OAAO;YACT,CAAC;YACD,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;gBAC7B,KAAK,EAAE,CAAC;YACV,CAAC;iBAAM,CAAC;gBACN,IAAI,EAAE,CAAC;YACT,CAAC;QACH,CAAC;QAED,wBAAwB;QACxB,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YACrB,aAAa,EAAE,CAAC;QAClB,CAAC;QAED,2BAA2B;QAC3B,IAAI,iBAAiB,EAAE,CAAC;YACtB,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,GAAG,EAAE,CAAC;gBAChC,eAAe,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBAC9C,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,GAAG,EAAE,CAAC;gBACvC,cAAc,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBAC7C,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,GAAG,EAAE,CAAC;gBACvC,mBAAmB,EAAE,CAAC;gBACtB,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QAED,2CAA2C;QAC3C,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YAC/C,MAAM,aAAa,GAAG,CAAC,UAAU,CAAC;YAClC,aAAa,CAAC,aAAa,CAAC,CAAC;YAC7B,YAAY,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useChat.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useChat.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmD,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACnG,OAAO,EACL,WAAW,EAEX,eAAe,EAQhB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE/E,wBAAgB,OAAO;2BAuG2B,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;;;;
|
|
1
|
+
{"version":3,"file":"useChat.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useChat.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmD,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACnG,OAAO,EACL,WAAW,EAEX,eAAe,EAQhB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE/E,wBAAgB,OAAO;2BAuG2B,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;;;;8BAoCrB,OAAO,CAAC,IAAI,CAAC;yBAiDxB,IAAI;8BAKG,OAAO,KAAG,IAAI;iBAoB7B,IAAI;;;;;;EAiBnC"}
|
package/dist/ui/hooks/useChat.js
CHANGED
|
@@ -102,23 +102,32 @@ export function useChat() {
|
|
|
102
102
|
toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
|
|
103
103
|
isStreaming: false,
|
|
104
104
|
});
|
|
105
|
+
const parsedToolCalls = toolCalls.length > 0 ? parseToolCalls(toolCalls) : [];
|
|
106
|
+
console.error('[DEBUG] sendMessage complete:', {
|
|
107
|
+
toolCallsCount: toolCalls.length,
|
|
108
|
+
parsedToolCalls: parsedToolCalls.map(tc => ({ id: tc.id, name: tc.name, status: tc.status })),
|
|
109
|
+
});
|
|
105
110
|
setState((prev) => ({
|
|
106
111
|
...prev,
|
|
107
|
-
pendingToolCalls:
|
|
112
|
+
pendingToolCalls: parsedToolCalls,
|
|
108
113
|
isLoading: false,
|
|
109
114
|
isStreaming: false,
|
|
110
115
|
}));
|
|
111
116
|
}
|
|
112
117
|
catch (error) {
|
|
113
118
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
119
|
+
console.error('[DEBUG] sendMessage error:', errorMessage);
|
|
114
120
|
updateMessage(assistantMsgId, { content: `Error: ${errorMessage}`, isStreaming: false });
|
|
115
121
|
setState((prev) => ({ ...prev, isLoading: false, isStreaming: false, error: errorMessage }));
|
|
116
122
|
}
|
|
117
123
|
}, [state.messages, addMessage, updateMessage, handleStreamResponse]);
|
|
118
124
|
const continueAfterTools = useCallback(async () => {
|
|
119
|
-
|
|
125
|
+
// Use ref to avoid stale closure - state.pendingToolCalls may be outdated
|
|
126
|
+
const currentPending = pendingToolCallsRef.current;
|
|
127
|
+
if (!isAllToolsHandled(currentPending))
|
|
120
128
|
return;
|
|
121
129
|
setState((prev) => ({ ...prev, pendingToolCalls: [], isLoading: true, isStreaming: true }));
|
|
130
|
+
pendingToolCallsRef.current = []; // Sync ref immediately
|
|
122
131
|
const assistantMsgId = addMessage({ role: 'assistant', content: '', isStreaming: true });
|
|
123
132
|
try {
|
|
124
133
|
const { content: fullContent, toolCalls } = await handleStreamResponse(assistantMsgId, messagesRef.current);
|
|
@@ -139,7 +148,7 @@ export function useChat() {
|
|
|
139
148
|
updateMessage(assistantMsgId, { content: `Error: ${errorMessage}`, isStreaming: false });
|
|
140
149
|
setState((prev) => ({ ...prev, isLoading: false, isStreaming: false, error: errorMessage }));
|
|
141
150
|
}
|
|
142
|
-
}, [
|
|
151
|
+
}, [addMessage, updateMessage, handleStreamResponse]);
|
|
143
152
|
continueAfterToolsRef.current = continueAfterTools;
|
|
144
153
|
// Auto-continue after all tools are handled
|
|
145
154
|
useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useChat.js","sourceRoot":"","sources":["../../../src/ui/hooks/useChat.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useChat.js","sourceRoot":"","sources":["../../../src/ui/hooks/useChat.ts"],"names":[],"mappings":"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"}
|