hoomanjs 1.40.2 → 1.41.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 +50 -3
- package/dist/acp/acp-agent.d.ts +16 -3
- package/dist/acp/acp-agent.js +371 -172
- package/dist/acp/acp-agent.js.map +1 -1
- package/dist/acp/commands.d.ts +6 -3
- package/dist/acp/commands.js +6 -24
- package/dist/acp/commands.js.map +1 -1
- package/dist/acp/meta/vscode.d.ts +10 -0
- package/dist/acp/meta/vscode.js +16 -0
- package/dist/acp/meta/vscode.js.map +1 -0
- package/dist/acp/questions.d.ts +18 -0
- package/dist/acp/questions.js +80 -0
- package/dist/acp/questions.js.map +1 -0
- package/dist/acp/session-config.d.ts +3 -1
- package/dist/acp/session-config.js +20 -8
- package/dist/acp/session-config.js.map +1 -1
- package/dist/acp/sessions/replay.js +117 -1
- package/dist/acp/sessions/replay.js.map +1 -1
- package/dist/acp/sessions/store.d.ts +55 -16
- package/dist/acp/sessions/store.js +174 -71
- package/dist/acp/sessions/store.js.map +1 -1
- package/dist/acp/utils/tool-kind.js +1 -0
- package/dist/acp/utils/tool-kind.js.map +1 -1
- package/dist/acp/utils/tool-result-content.d.ts +1 -0
- package/dist/acp/utils/tool-result-content.js +28 -1
- package/dist/acp/utils/tool-result-content.js.map +1 -1
- package/dist/chat/app.d.ts +3 -1
- package/dist/chat/app.js +65 -17
- package/dist/chat/app.js.map +1 -1
- package/dist/chat/components/BottomChrome.d.ts +12 -3
- package/dist/chat/components/BottomChrome.js +2 -2
- package/dist/chat/components/BottomChrome.js.map +1 -1
- package/dist/chat/components/ChromePicker.d.ts +5 -1
- package/dist/chat/components/ChromePicker.js +6 -2
- package/dist/chat/components/ChromePicker.js.map +1 -1
- package/dist/chat/components/QuestionPrompt.d.ts +8 -0
- package/dist/chat/components/QuestionPrompt.js +41 -0
- package/dist/chat/components/QuestionPrompt.js.map +1 -0
- package/dist/chat/components/StatusBar.d.ts +8 -3
- package/dist/chat/components/StatusBar.js +55 -26
- package/dist/chat/components/StatusBar.js.map +1 -1
- package/dist/chat/index.d.ts +2 -0
- package/dist/chat/index.js +1 -1
- package/dist/chat/index.js.map +1 -1
- package/dist/chat/questions.d.ts +24 -0
- package/dist/chat/questions.js +71 -0
- package/dist/chat/questions.js.map +1 -0
- package/dist/cli.js +9 -0
- package/dist/cli.js.map +1 -1
- package/dist/core/agent/index.d.ts +3 -0
- package/dist/core/agent/index.js +11 -5
- package/dist/core/agent/index.js.map +1 -1
- package/dist/core/agent/session-title-plugin.d.ts +27 -0
- package/dist/core/agent/session-title-plugin.js +77 -0
- package/dist/core/agent/session-title-plugin.js.map +1 -0
- package/dist/core/config.d.ts +30 -1
- package/dist/core/config.js +2 -0
- package/dist/core/config.js.map +1 -1
- package/dist/core/index.d.ts +12 -0
- package/dist/core/index.js +7 -2
- package/dist/core/index.js.map +1 -1
- package/dist/core/models/azure.js +5 -1
- package/dist/core/models/azure.js.map +1 -1
- package/dist/core/models/groq.js +5 -1
- package/dist/core/models/groq.js.map +1 -1
- package/dist/core/models/moonshot.js +5 -1
- package/dist/core/models/moonshot.js.map +1 -1
- package/dist/core/models/openai.js +6 -1
- package/dist/core/models/openai.js.map +1 -1
- package/dist/core/models/openrouter.js +5 -1
- package/dist/core/models/openrouter.js.map +1 -1
- package/dist/core/models/types.d.ts +44 -0
- package/dist/core/models/types.js +15 -0
- package/dist/core/models/types.js.map +1 -1
- package/dist/core/models/usage.d.ts +10 -0
- package/dist/core/models/usage.js +45 -0
- package/dist/core/models/usage.js.map +1 -0
- package/dist/core/models/xai.js +5 -1
- package/dist/core/models/xai.js.map +1 -1
- package/dist/core/modes/definitions.js +2 -0
- package/dist/core/modes/definitions.js.map +1 -1
- package/dist/core/prompts/static/ask-user.md +7 -0
- package/dist/core/prompts/static/filesystem.md +1 -1
- package/dist/core/prompts/system.js +5 -0
- package/dist/core/prompts/system.js.map +1 -1
- package/dist/core/sessions/generate-title.d.ts +10 -0
- package/dist/core/sessions/generate-title.js +113 -0
- package/dist/core/sessions/generate-title.js.map +1 -0
- package/dist/core/sessions/list-cli-sessions.js +13 -1
- package/dist/core/sessions/list-cli-sessions.js.map +1 -1
- package/dist/core/skills/built-in/hooman-config/providers.md +17 -0
- package/dist/core/skills/built-in/hooman-skills/SKILL.md +1 -1
- package/dist/core/state/session-title.d.ts +17 -0
- package/dist/core/state/session-title.js +15 -0
- package/dist/core/state/session-title.js.map +1 -0
- package/dist/core/state/tool-approvals.js +3 -0
- package/dist/core/state/tool-approvals.js.map +1 -1
- package/dist/core/tools/ask-user.d.ts +38 -0
- package/dist/core/tools/ask-user.js +62 -0
- package/dist/core/tools/ask-user.js.map +1 -0
- package/dist/core/tools/filesystem.d.ts +26 -1
- package/dist/core/tools/filesystem.js +44 -23
- package/dist/core/tools/filesystem.js.map +1 -1
- package/dist/core/tools/index.d.ts +1 -0
- package/dist/core/tools/index.js +1 -0
- package/dist/core/tools/index.js.map +1 -1
- package/dist/core/tools/shell.d.ts +41 -0
- package/dist/core/tools/shell.js +8 -1
- package/dist/core/tools/shell.js.map +1 -1
- package/dist/core/utils/billing.d.ts +49 -0
- package/dist/core/utils/billing.js +295 -0
- package/dist/core/utils/billing.js.map +1 -0
- package/dist/core/utils/edit-replace.d.ts +6 -0
- package/dist/core/utils/edit-replace.js +88 -6
- package/dist/core/utils/edit-replace.js.map +1 -1
- package/dist/core/utils/paths.d.ts +1 -0
- package/dist/core/utils/paths.js +1 -0
- package/dist/core/utils/paths.js.map +1 -1
- package/dist/core/{models → utils}/reasoning-effort.d.ts +9 -0
- package/dist/core/utils/reasoning-effort.js.map +1 -0
- package/dist/exec/questions.d.ts +9 -0
- package/dist/exec/questions.js +50 -0
- package/dist/exec/questions.js.map +1 -0
- package/dist/index.d.ts +5 -4
- package/dist/index.js +5 -4
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
- package/dist/core/models/reasoning-effort.js.map +0 -1
- package/dist/core/tools/terminal-backend.d.ts +0 -41
- package/dist/core/tools/terminal-backend.js +0 -9
- package/dist/core/tools/terminal-backend.js.map +0 -1
- package/dist/core/tools/text-fs-backend.d.ts +0 -25
- package/dist/core/tools/text-fs-backend.js +0 -9
- package/dist/core/tools/text-fs-backend.js.map +0 -1
- /package/dist/core/{models → utils}/reasoning-effort.js +0 -0
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { Text } from "ink";
|
|
3
3
|
import { MODE_DEFINITIONS } from "../../core/modes/index.js";
|
|
4
|
-
import { currentReasoningEffort, REASONING_EFFORT_LEVELS, REASONING_EFFORT_OFF, } from "../../core/
|
|
4
|
+
import { currentReasoningEffort, REASONING_EFFORT_LEVELS, REASONING_EFFORT_OFF, } from "../../core/utils/reasoning-effort.js";
|
|
5
5
|
import { ApprovalPrompt } from "./ApprovalPrompt.js";
|
|
6
|
+
import { QuestionPrompt } from "./QuestionPrompt.js";
|
|
6
7
|
import { SelectPicker } from "./SelectPicker.js";
|
|
7
|
-
export function ChromePicker({ config, pendingApproval, approvalRequest, picker, yoloOn, sessionMode, onApprovalDecision, sessionItems, onModelSelect, onEffortSelect, onYoloSelect, onModeSelect, onSessionSelect, }) {
|
|
8
|
+
export function ChromePicker({ config, pendingApproval, approvalRequest, pendingQuestion, picker, yoloOn, sessionMode, onApprovalDecision, onQuestionAnswer, onQuestionDismiss, sessionItems, onModelSelect, onEffortSelect, onYoloSelect, onModeSelect, onSessionSelect, }) {
|
|
8
9
|
if (pendingApproval) {
|
|
9
10
|
return (_jsx(ApprovalPrompt, { request: approvalRequest, onDecision: onApprovalDecision }));
|
|
10
11
|
}
|
|
12
|
+
if (pendingQuestion) {
|
|
13
|
+
return (_jsx(QuestionPrompt, { question: pendingQuestion, onAnswer: onQuestionAnswer, onDismiss: onQuestionDismiss }));
|
|
14
|
+
}
|
|
11
15
|
if (picker === "model") {
|
|
12
16
|
return (_jsx(SelectPicker, { title: "Choose model", items: config.llms.map((entry) => ({
|
|
13
17
|
label: `${entry.name} • ${entry.provider}/${entry.options.model}${entry.default ? " • current" : ""}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChromePicker.js","sourceRoot":"","sources":["../../../src/chat/components/ChromePicker.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,gBAAgB,EAAoB,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,
|
|
1
|
+
{"version":3,"file":"ChromePicker.js","sourceRoot":"","sources":["../../../src/chat/components/ChromePicker.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ChatQuestion } from "../questions.js";
|
|
2
|
+
type QuestionPromptProps = {
|
|
3
|
+
question: ChatQuestion;
|
|
4
|
+
onAnswer: (answer: string) => void;
|
|
5
|
+
onDismiss: () => void;
|
|
6
|
+
};
|
|
7
|
+
export declare function QuestionPrompt({ question, onAnswer, onDismiss, }: QuestionPromptProps): import("react/jsx-runtime").JSX.Element;
|
|
8
|
+
export {};
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { useState } from "react";
|
|
3
|
+
import { Box, Text } from "ink";
|
|
4
|
+
import SelectInput from "ink-select-input";
|
|
5
|
+
import TextInput from "ink-text-input";
|
|
6
|
+
const FREE_TEXT_VALUE = "__free_text__";
|
|
7
|
+
const DISMISS_VALUE = "__dismiss__";
|
|
8
|
+
export function QuestionPrompt({ question, onAnswer, onDismiss, }) {
|
|
9
|
+
const [freeTextMode, setFreeTextMode] = useState(false);
|
|
10
|
+
const [freeText, setFreeText] = useState("");
|
|
11
|
+
if (freeTextMode) {
|
|
12
|
+
return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "cyan", bold: true, children: question.question }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "gray", children: "> " }), _jsx(TextInput, { value: freeText, onChange: setFreeText, onSubmit: (value) => {
|
|
13
|
+
const trimmed = value.trim();
|
|
14
|
+
if (trimmed) {
|
|
15
|
+
onAnswer(trimmed);
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
onDismiss();
|
|
19
|
+
}
|
|
20
|
+
}, placeholder: "Type your answer" })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "enter submit \u2022 empty answer dismisses" }) })] }));
|
|
21
|
+
}
|
|
22
|
+
return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "cyan", bold: true, children: question.question }), _jsx(SelectInput, { items: [
|
|
23
|
+
...question.options.map((option) => ({
|
|
24
|
+
label: option,
|
|
25
|
+
value: option,
|
|
26
|
+
})),
|
|
27
|
+
{ label: "Type your own answer…", value: FREE_TEXT_VALUE },
|
|
28
|
+
{ label: "Dismiss", value: DISMISS_VALUE },
|
|
29
|
+
], onSelect: (item) => {
|
|
30
|
+
if (item.value === FREE_TEXT_VALUE) {
|
|
31
|
+
setFreeTextMode(true);
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
if (item.value === DISMISS_VALUE) {
|
|
35
|
+
onDismiss();
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
onAnswer(item.value);
|
|
39
|
+
} }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "up/down - choose - enter select" }) })] }));
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=QuestionPrompt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"QuestionPrompt.js","sourceRoot":"","sources":["../../../src/chat/components/QuestionPrompt.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAC3C,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAGvC,MAAM,eAAe,GAAG,eAAe,CAAC;AACxC,MAAM,aAAa,GAAG,aAAa,CAAC;AAQpC,MAAM,UAAU,cAAc,CAAC,EAC7B,QAAQ,EACR,QAAQ,EACR,SAAS,GACW;IACpB,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE7C,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,IAAI,IAAC,KAAK,EAAC,MAAM,EAAC,IAAI,kBACpB,QAAQ,CAAC,QAAQ,GACb,EACP,MAAC,GAAG,IAAC,SAAS,EAAE,CAAC,aACf,KAAC,IAAI,IAAC,KAAK,EAAC,MAAM,YAAE,IAAI,GAAQ,EAChC,KAAC,SAAS,IACR,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;gCAClB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gCAC7B,IAAI,OAAO,EAAE,CAAC;oCACZ,QAAQ,CAAC,OAAO,CAAC,CAAC;gCACpB,CAAC;qCAAM,CAAC;oCACN,SAAS,EAAE,CAAC;gCACd,CAAC;4BACH,CAAC,EACD,WAAW,EAAC,kBAAkB,GAC9B,IACE,EACN,KAAC,GAAG,IAAC,SAAS,EAAE,CAAC,YACf,KAAC,IAAI,IAAC,KAAK,EAAC,MAAM,2DAA6C,GAC3D,IACF,CACP,CAAC;IACJ,CAAC;IAED,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,IAAI,IAAC,KAAK,EAAC,MAAM,EAAC,IAAI,kBACpB,QAAQ,CAAC,QAAQ,GACb,EACP,KAAC,WAAW,IACV,KAAK,EAAE;oBACL,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;wBACnC,KAAK,EAAE,MAAM;wBACb,KAAK,EAAE,MAAM;qBACd,CAAC,CAAC;oBACH,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE,eAAe,EAAE;oBAC1D,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE;iBAC3C,EACD,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;oBACjB,IAAI,IAAI,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;wBACnC,eAAe,CAAC,IAAI,CAAC,CAAC;wBACtB,OAAO;oBACT,CAAC;oBACD,IAAI,IAAI,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;wBACjC,SAAS,EAAE,CAAC;wBACZ,OAAO;oBACT,CAAC;oBACD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC,GACD,EACF,KAAC,GAAG,IAAC,SAAS,EAAE,CAAC,YACf,KAAC,IAAI,IAAC,KAAK,EAAC,MAAM,gDAAuC,GACrD,IACF,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import type { Manager as McpManager } from "../../core/mcp/index.js";
|
|
2
2
|
type StatusBarProps = {
|
|
3
3
|
running: boolean;
|
|
4
|
-
status: string;
|
|
5
4
|
currentModel: string;
|
|
6
5
|
reasoningEffort?: string;
|
|
7
6
|
yoloOn: boolean;
|
|
8
7
|
sessionMode: string;
|
|
9
8
|
elapsedLabel: string;
|
|
10
|
-
turnCount: number;
|
|
11
9
|
totalTools: number;
|
|
12
10
|
skillsFound: number;
|
|
13
11
|
manager: McpManager;
|
|
@@ -20,6 +18,13 @@ type StatusBarProps = {
|
|
|
20
18
|
cacheWriteInputTokens?: number;
|
|
21
19
|
latencyMs: number;
|
|
22
20
|
};
|
|
21
|
+
/** Context-window utilization; only set when the window size was resolved. */
|
|
22
|
+
contextUsage?: {
|
|
23
|
+
used: number;
|
|
24
|
+
size: number;
|
|
25
|
+
};
|
|
26
|
+
/** Cumulative session cost in USD; only set when pricing was resolved. */
|
|
27
|
+
costUsd?: number;
|
|
23
28
|
};
|
|
24
|
-
export declare function StatusBar({ running,
|
|
29
|
+
export declare function StatusBar({ running, currentModel, reasoningEffort, yoloOn, sessionMode, elapsedLabel, totalTools, skillsFound, manager, mcpNeedsAttention, usage, contextUsage, costUsd, }: StatusBarProps): import("react/jsx-runtime").JSX.Element;
|
|
25
30
|
export {};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { jsx as _jsx,
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
+
import { Fragment } from "react";
|
|
2
3
|
import { Box, Text } from "ink";
|
|
3
4
|
import { millify } from "millify";
|
|
4
5
|
const TOKEN_MILLIFY_OPTS = {
|
|
@@ -12,6 +13,29 @@ function formatTokenCount(n) {
|
|
|
12
13
|
}
|
|
13
14
|
return millify(Math.round(n), TOKEN_MILLIFY_OPTS);
|
|
14
15
|
}
|
|
16
|
+
/** "$0.0451" under a dollar, "$1.23" under a hundred, whole dollars beyond. */
|
|
17
|
+
function formatCostUsd(amount) {
|
|
18
|
+
if (!Number.isFinite(amount) || amount <= 0) {
|
|
19
|
+
return "$0.00";
|
|
20
|
+
}
|
|
21
|
+
if (amount < 1) {
|
|
22
|
+
return `$${amount.toFixed(4)}`;
|
|
23
|
+
}
|
|
24
|
+
if (amount < 100) {
|
|
25
|
+
return `$${amount.toFixed(2)}`;
|
|
26
|
+
}
|
|
27
|
+
return `$${Math.round(amount)}`;
|
|
28
|
+
}
|
|
29
|
+
/** Color the context-utilization percentage as it approaches the window limit. */
|
|
30
|
+
function contextUsageColor(ratio) {
|
|
31
|
+
if (ratio >= 0.9) {
|
|
32
|
+
return "red";
|
|
33
|
+
}
|
|
34
|
+
if (ratio >= 0.7) {
|
|
35
|
+
return "yellow";
|
|
36
|
+
}
|
|
37
|
+
return "green";
|
|
38
|
+
}
|
|
15
39
|
function sessionModeValueColor(mode) {
|
|
16
40
|
const normalized = mode.trim().toLowerCase();
|
|
17
41
|
if (normalized === "plan") {
|
|
@@ -37,33 +61,38 @@ function reasoningEffortColor(effort) {
|
|
|
37
61
|
return "magenta";
|
|
38
62
|
}
|
|
39
63
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
case "streaming":
|
|
47
|
-
case "running tool":
|
|
48
|
-
case "cancel requested":
|
|
49
|
-
return "yellow";
|
|
50
|
-
default:
|
|
51
|
-
return "gray";
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
export function StatusBar({ running, status, currentModel, reasoningEffort, yoloOn, sessionMode, elapsedLabel, turnCount, totalTools, skillsFound, manager, mcpNeedsAttention, usage, }) {
|
|
55
|
-
// Cumulative billing meter. Providers with prompt caching (e.g. Anthropic)
|
|
56
|
-
// report `inputTokens` as only the uncached portion and account the bulk of
|
|
57
|
-
// the prompt under cache read/write, so surface cached input (`cin`)
|
|
58
|
-
// separately — but only when the provider actually reports caching.
|
|
64
|
+
export function StatusBar({ running, currentModel, reasoningEffort, yoloOn, sessionMode, elapsedLabel, totalTools, skillsFound, manager, mcpNeedsAttention, usage, contextUsage, costUsd, }) {
|
|
65
|
+
// Cumulative billing meter. Usage is normalized to the additive shape
|
|
66
|
+
// before accumulation (see src/core/models/usage.ts): `inputTokens` is only
|
|
67
|
+
// the uncached portion, with cached input (read + write) folded into the
|
|
68
|
+
// same segment as `uncached/cached in` — the cached part shows only when
|
|
69
|
+
// the provider actually reports caching.
|
|
59
70
|
const cacheInput = (usage.cacheReadInputTokens ?? 0) + (usage.cacheWriteInputTokens ?? 0);
|
|
71
|
+
const inputLabel = cacheInput > 0
|
|
72
|
+
? `${formatTokenCount(usage.inputTokens)}/${formatTokenCount(cacheInput)} in`
|
|
73
|
+
: `${formatTokenCount(usage.inputTokens)} in`;
|
|
60
74
|
const tokensLabel = [
|
|
61
|
-
|
|
62
|
-
cacheInput > 0 ? `${formatTokenCount(cacheInput)} cin` : null,
|
|
75
|
+
inputLabel,
|
|
63
76
|
`${formatTokenCount(usage.outputTokens)} out`,
|
|
64
|
-
]
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
77
|
+
].join(", ");
|
|
78
|
+
const hasTokens = usage.inputTokens + cacheInput + usage.outputTokens > 0;
|
|
79
|
+
// Context-window utilization + session cost, resolved from the model's
|
|
80
|
+
// `billing` config / the models.dev catalog. Hidden when unresolved.
|
|
81
|
+
const contextRatio = contextUsage && contextUsage.size > 0
|
|
82
|
+
? contextUsage.used / contextUsage.size
|
|
83
|
+
: null;
|
|
84
|
+
// Middle row: context • tokens • cost (each hidden until it has data).
|
|
85
|
+
// The row collapses when empty.
|
|
86
|
+
const usageSegments = [];
|
|
87
|
+
if (contextUsage && contextRatio !== null) {
|
|
88
|
+
usageSegments.push(_jsxs(Fragment, { children: [_jsx(Text, { color: "gray", children: "context: " }), _jsxs(Text, { color: contextUsageColor(contextRatio), children: [Math.min(100, Math.round(contextRatio * 100)), "%"] }), _jsxs(Text, { color: "gray", children: [" ", "(", formatTokenCount(contextUsage.used), "/", formatTokenCount(contextUsage.size), ")"] })] }));
|
|
89
|
+
}
|
|
90
|
+
if (hasTokens) {
|
|
91
|
+
usageSegments.push(_jsxs(Text, { color: "gray", children: ["tokens: ", tokensLabel] }));
|
|
92
|
+
}
|
|
93
|
+
if (costUsd !== undefined) {
|
|
94
|
+
usageSegments.push(_jsxs(Text, { color: "gray", children: ["cost: ", formatCostUsd(costUsd)] }));
|
|
95
|
+
}
|
|
96
|
+
return (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { color: "gray", children: "model: " }), _jsx(Text, { bold: true, children: currentModel }), reasoningEffort ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: "gray", children: " \u2022 effort: " }), _jsx(Text, { color: reasoningEffortColor(reasoningEffort), children: reasoningEffort })] })) : null, _jsx(Text, { color: "gray", children: " \u2022 mode: " }), _jsx(Text, { color: sessionModeValueColor(sessionMode), children: sessionMode }), _jsx(Text, { color: "gray", children: " \u2022 yolo: " }), _jsx(Text, { color: yoloOn ? "red" : "green", children: yoloOn ? "on" : "off" })] }), usageSegments.length > 0 ? (_jsx(Text, { children: usageSegments.map((segment, index) => (_jsxs(Fragment, { children: [index > 0 ? _jsx(Text, { color: "gray", children: " \u2022 " }) : null, segment] }, index))) })) : null, _jsxs(Text, { color: "gray", children: [`mcp servers: ${manager.clients.size}`, mcpNeedsAttention ? (_jsx(Text, { color: "yellow", children: " (needs attention)" })) : null, ` • tools: ${totalTools} • skills: ${skillsFound}`, running ? ` • elapsed ${elapsedLabel}` : ""] })] }));
|
|
68
97
|
}
|
|
69
98
|
//# sourceMappingURL=StatusBar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StatusBar.js","sourceRoot":"","sources":["../../../src/chat/components/StatusBar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlC,MAAM,kBAAkB,GAAG;IACzB,SAAS,EAAE,IAAI;IACf,SAAS,EAAE,CAAC;IACZ,KAAK,EAAE,KAAK;CACJ,CAAC;AAEX,SAAS,gBAAgB,CAAC,CAAS;IACjC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;AACpD,CAAC;
|
|
1
|
+
{"version":3,"file":"StatusBar.js","sourceRoot":"","sources":["../../../src/chat/components/StatusBar.tsx"],"names":[],"mappings":"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"}
|
package/dist/chat/index.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { Config } from "../core/config.js";
|
|
|
3
3
|
import type { Manager as McpManager } from "../core/mcp/index.js";
|
|
4
4
|
import type { Registry } from "../core/skills/index.js";
|
|
5
5
|
import type { ChatApprovalController } from "./approvals.js";
|
|
6
|
+
import type { ChatQuestionController } from "./questions.js";
|
|
6
7
|
import type { ChatTurnSteeringController } from "./steering.js";
|
|
7
8
|
type LaunchChatOptions = {
|
|
8
9
|
agent: Agent;
|
|
@@ -12,6 +13,7 @@ type LaunchChatOptions = {
|
|
|
12
13
|
sessionId: string;
|
|
13
14
|
prompt?: string;
|
|
14
15
|
approvals: ChatApprovalController;
|
|
16
|
+
questions: ChatQuestionController;
|
|
15
17
|
steering: ChatTurnSteeringController;
|
|
16
18
|
/** CLI binary name for resume hint (from package.json `bin`). */
|
|
17
19
|
program?: string;
|
package/dist/chat/index.js
CHANGED
|
@@ -15,7 +15,7 @@ export async function chat(options) {
|
|
|
15
15
|
let done = false;
|
|
16
16
|
let nextAction = "exit";
|
|
17
17
|
let resumeSessionId;
|
|
18
|
-
const { waitUntilExit, unmount } = render(_jsx(ChatApp, { agent: options.agent, config: options.config, manager: options.manager, registry: options.registry, sessionId: options.sessionId, prompt: options.prompt, approvals: options.approvals, steering: options.steering, onExit: () => {
|
|
18
|
+
const { waitUntilExit, unmount } = render(_jsx(ChatApp, { agent: options.agent, config: options.config, manager: options.manager, registry: options.registry, sessionId: options.sessionId, prompt: options.prompt, approvals: options.approvals, questions: options.questions, steering: options.steering, onExit: () => {
|
|
19
19
|
done = true;
|
|
20
20
|
}, onNewSession: () => {
|
|
21
21
|
done = true;
|
package/dist/chat/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/chat/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/chat/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAQtC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAqBnC,SAAS,sBAAsB,CAAC,OAAe,EAAE,SAAiB;IAChE,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,QAAQ,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CACT,IAAI,SAAS,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,IAAI,SAAS,CAC5D,CAAC,OAAO,CAAC,EACT,GAAG,GAAG,YAAY,SAAS,EAAE,CAC9B,EAAE,CACJ,CAAC;IACF,OAAO,CAAC,GAAG,CACT,IAAI,SAAS,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,2BAA2B,CAAC,IAAI,SAAS,CACxE,CAAC,OAAO,CAAC,EACT,GAAG,GAAG,kBAAkB,CACzB,EAAE,CACJ,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,OAA0B;IACnD,8EAA8E;IAC9E,4EAA4E;IAC5E,uCAAuC;IACvC,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,UAAU,GAA6B,MAAM,CAAC;IAClD,IAAI,eAAmC,CAAC;IACxC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,MAAM,CACvC,KAAC,OAAO,IACN,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,MAAM,EAAE,GAAG,EAAE;YACX,IAAI,GAAG,IAAI,CAAC;QACd,CAAC,EACD,YAAY,EAAE,GAAG,EAAE;YACjB,IAAI,GAAG,IAAI,CAAC;YACZ,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC,EACD,eAAe,EAAE,CAAC,SAAS,EAAE,EAAE;YAC7B,IAAI,GAAG,IAAI,CAAC;YACZ,UAAU,GAAG,QAAQ,CAAC;YACtB,eAAe,GAAG,SAAS,CAAC;QAC9B,CAAC,EACD,WAAW,EAAE,GAAG,EAAE;YAChB,IAAI,GAAG,IAAI,CAAC;YACZ,UAAU,GAAG,WAAW,CAAC;QAC3B,CAAC,GACD,EACF;QACE,uEAAuE;QACvE,yEAAyE;QACzE,sEAAsE;QACtE,WAAW,EAAE,KAAK;KACnB,CACF,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,aAAa,EAAE,CAAC;IACxB,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IACD,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QAC1B,sBAAsB,CAAC,OAAO,CAAC,OAAO,IAAI,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACzE,CAAC;IACD,OAAO;QACL,UAAU;QACV,eAAe;KAChB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { AskUserBackend, AskUserRequest, AskUserResponse } from "../core/tools/ask-user.js";
|
|
2
|
+
export type ChatQuestion = {
|
|
3
|
+
id: string;
|
|
4
|
+
question: string;
|
|
5
|
+
options: string[];
|
|
6
|
+
};
|
|
7
|
+
/**
|
|
8
|
+
* FIFO queue bridging the `ask_user` tool (which blocks inside its callback)
|
|
9
|
+
* to the Ink chrome, mirroring {@link ChatApprovalController}: the tool awaits
|
|
10
|
+
* `request()`, the UI renders `pending` and calls `answer()`/`dismiss()`.
|
|
11
|
+
*/
|
|
12
|
+
export declare class ChatQuestionController {
|
|
13
|
+
private readonly queue;
|
|
14
|
+
private readonly listeners;
|
|
15
|
+
private nextId;
|
|
16
|
+
subscribe(listener: () => void): () => void;
|
|
17
|
+
get pending(): ChatQuestion | null;
|
|
18
|
+
request(request: AskUserRequest): Promise<AskUserResponse>;
|
|
19
|
+
answer(answer: string): void;
|
|
20
|
+
dismiss(): void;
|
|
21
|
+
private resolveNext;
|
|
22
|
+
private emit;
|
|
23
|
+
}
|
|
24
|
+
export declare function createChatAskUserBackend(controller: ChatQuestionController): AskUserBackend;
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* FIFO queue bridging the `ask_user` tool (which blocks inside its callback)
|
|
3
|
+
* to the Ink chrome, mirroring {@link ChatApprovalController}: the tool awaits
|
|
4
|
+
* `request()`, the UI renders `pending` and calls `answer()`/`dismiss()`.
|
|
5
|
+
*/
|
|
6
|
+
export class ChatQuestionController {
|
|
7
|
+
queue = [];
|
|
8
|
+
listeners = new Set();
|
|
9
|
+
nextId = 0;
|
|
10
|
+
subscribe(listener) {
|
|
11
|
+
this.listeners.add(listener);
|
|
12
|
+
return () => {
|
|
13
|
+
this.listeners.delete(listener);
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
get pending() {
|
|
17
|
+
return this.queue[0]?.request ?? null;
|
|
18
|
+
}
|
|
19
|
+
request(request) {
|
|
20
|
+
const queued = {
|
|
21
|
+
id: String(this.nextId++),
|
|
22
|
+
question: request.question,
|
|
23
|
+
options: request.options,
|
|
24
|
+
};
|
|
25
|
+
return new Promise((resolve) => {
|
|
26
|
+
const item = { request: queued, resolve };
|
|
27
|
+
this.queue.push(item);
|
|
28
|
+
if (request.signal) {
|
|
29
|
+
const onAbort = () => {
|
|
30
|
+
const index = this.queue.indexOf(item);
|
|
31
|
+
if (index !== -1) {
|
|
32
|
+
this.queue.splice(index, 1);
|
|
33
|
+
resolve({ kind: "dismissed" });
|
|
34
|
+
this.emit();
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
if (request.signal.aborted) {
|
|
38
|
+
onAbort();
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
request.signal.addEventListener("abort", onAbort, { once: true });
|
|
42
|
+
}
|
|
43
|
+
this.emit();
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
answer(answer) {
|
|
47
|
+
this.resolveNext({ kind: "answered", answer });
|
|
48
|
+
}
|
|
49
|
+
dismiss() {
|
|
50
|
+
this.resolveNext({ kind: "dismissed" });
|
|
51
|
+
}
|
|
52
|
+
resolveNext(response) {
|
|
53
|
+
const item = this.queue.shift();
|
|
54
|
+
if (!item) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
item.resolve(response);
|
|
58
|
+
this.emit();
|
|
59
|
+
}
|
|
60
|
+
emit() {
|
|
61
|
+
for (const listener of this.listeners) {
|
|
62
|
+
listener();
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
export function createChatAskUserBackend(controller) {
|
|
67
|
+
return {
|
|
68
|
+
ask: (request) => controller.request(request),
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=questions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../src/chat/questions.ts"],"names":[],"mappings":"AAiBA;;;;GAIG;AACH,MAAM,OAAO,sBAAsB;IAChB,KAAK,GAAgB,EAAE,CAAC;IACxB,SAAS,GAAG,IAAI,GAAG,EAAc,CAAC;IAC3C,MAAM,GAAG,CAAC,CAAC;IAEZ,SAAS,CAAC,QAAoB;QACnC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC;IACxC,CAAC;IAEM,OAAO,CAAC,OAAuB;QACpC,MAAM,MAAM,GAAiB;YAC3B,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACzB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QACF,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,EAAE;YAC9C,MAAM,IAAI,GAAc,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;YACrD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,OAAO,GAAG,GAAG,EAAE;oBACnB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACvC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;wBACjB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;wBAC5B,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;wBAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,CAAC;gBACH,CAAC,CAAC;gBACF,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBAC3B,OAAO,EAAE,CAAC;oBACV,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACpE,CAAC;YACD,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,MAAc;QAC1B,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IACjD,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IAC1C,CAAC;IAEO,WAAW,CAAC,QAAyB;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAEO,IAAI;QACV,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACtC,QAAQ,EAAE,CAAC;QACb,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,wBAAwB,CACtC,UAAkC;IAElC,OAAO;QACL,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC;KAC9C,CAAC;AACJ,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -7,6 +7,9 @@ import { createMcpConfig, createMcpManager } from "./core/mcp/index.js";
|
|
|
7
7
|
import { createToolApprovalIntervention } from "./exec/approvals.js";
|
|
8
8
|
import { chat } from "./chat/index.js";
|
|
9
9
|
import { ChatApprovalController, createChatApprovalIntervention, } from "./chat/approvals.js";
|
|
10
|
+
import { ChatQuestionController, createChatAskUserBackend, } from "./chat/questions.js";
|
|
11
|
+
import { setAskUserBackend } from "./core/tools/ask-user.js";
|
|
12
|
+
import { canPromptForQuestion, createExecAskUserBackend, } from "./exec/questions.js";
|
|
10
13
|
import { ChatTurnSteeringController, createChatTurnSteeringIntervention, } from "./chat/steering.js";
|
|
11
14
|
import { configure } from "./configure/index.js";
|
|
12
15
|
import { runAcpStdio } from "./acp/index.js";
|
|
@@ -154,6 +157,9 @@ program
|
|
|
154
157
|
mode: options.mode,
|
|
155
158
|
interventions: [createToolApprovalIntervention()],
|
|
156
159
|
}, true);
|
|
160
|
+
if (canPromptForQuestion()) {
|
|
161
|
+
setAskUserBackend(agent, createExecAskUserBackend());
|
|
162
|
+
}
|
|
157
163
|
try {
|
|
158
164
|
await runWithAgentMemoryScope(agent, () => agent.invoke(prompt));
|
|
159
165
|
}
|
|
@@ -187,6 +193,7 @@ program
|
|
|
187
193
|
let currentMode = options.mode;
|
|
188
194
|
while (true) {
|
|
189
195
|
const approvals = new ChatApprovalController();
|
|
196
|
+
const questions = new ChatQuestionController();
|
|
190
197
|
const steering = new ChatTurnSteeringController();
|
|
191
198
|
const { agent, mcp: { manager }, registry, } = await bootstrap("default", {
|
|
192
199
|
userId: "default",
|
|
@@ -198,6 +205,7 @@ program
|
|
|
198
205
|
createChatTurnSteeringIntervention(steering),
|
|
199
206
|
],
|
|
200
207
|
}, false, config);
|
|
208
|
+
setAskUserBackend(agent, createChatAskUserBackend(questions));
|
|
201
209
|
try {
|
|
202
210
|
const result = await chat({
|
|
203
211
|
agent,
|
|
@@ -207,6 +215,7 @@ program
|
|
|
207
215
|
sessionId: currentSessionId,
|
|
208
216
|
prompt: currentPrompt,
|
|
209
217
|
approvals,
|
|
218
|
+
questions,
|
|
210
219
|
steering,
|
|
211
220
|
program: packageMeta.name,
|
|
212
221
|
});
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { type Config } from "../config.js";
|
|
|
3
3
|
import { FileMemoryStore } from "../memory/index.js";
|
|
4
4
|
import type { Manager as McpManager } from "../mcp/index.js";
|
|
5
5
|
import type { System as SystemPrompt } from "../prompts/index.js";
|
|
6
|
+
import { type SessionTitleCallback } from "./session-title-plugin.js";
|
|
6
7
|
import { type SessionMode } from "../state/session-mode.js";
|
|
7
8
|
export declare function getAgentConversationManager(agent: Agent): ConversationManager | undefined;
|
|
8
9
|
export declare function getAgentSessionManager(agent: Agent): SessionManager | undefined;
|
|
@@ -15,6 +16,8 @@ export declare function create(config: Config, system: SystemPrompt, mcp: {
|
|
|
15
16
|
yolo?: boolean;
|
|
16
17
|
mode?: SessionMode;
|
|
17
18
|
interventions?: InterventionHandler[];
|
|
19
|
+
/** Notified when the session-title plugin generates a title (e.g. ACP `session_info_update`). */
|
|
20
|
+
onSessionTitle?: SessionTitleCallback;
|
|
18
21
|
}): Promise<Agent>;
|
|
19
22
|
export declare function createContext(sessionId?: string): {
|
|
20
23
|
plugins: Plugin[];
|
package/dist/core/agent/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Agent, BeforeInvocationEvent, HookOrder, IntervalTrigger, SessionManager, SummarizingConversationManager, } from "@strands-agents/sdk";
|
|
2
2
|
import { ContextInjector } from "@strands-agents/sdk/vended-plugins/context-injector";
|
|
3
3
|
import { ContextOffloader } from "@strands-agents/sdk/vended-plugins/context-offloader";
|
|
4
|
-
import { join } from "node:path";
|
|
5
4
|
import { FileMemoryStore } from "../memory/index.js";
|
|
6
5
|
import { ToolBasedModelExtractor } from "../memory/model-extractor.js";
|
|
7
6
|
import { modelProviders } from "../models/index.js";
|
|
@@ -9,18 +8,18 @@ import { FlatFileStorage } from "../sessions/flat-file-storage.js";
|
|
|
9
8
|
import { LazySessionManager } from "../sessions/lazy-session-manager.js";
|
|
10
9
|
import { TolerantFileStorage } from "../sessions/tolerant-file-storage.js";
|
|
11
10
|
import { createSubagentTools, loadSubagentRegistry, } from "../subagents/index.js";
|
|
12
|
-
import { createTodoTools, createFetchTools, createFilesystemTools, createGrepTools, clearReadTimeAgentInstructionState, createPlanTools, createSleepTools, createShellTools, createThinkingTools, createTimeTools, createWebSearchTools, } from "../tools/index.js";
|
|
11
|
+
import { createAskUserTools, createTodoTools, createFetchTools, createFilesystemTools, createGrepTools, clearReadTimeAgentInstructionState, createPlanTools, createSleepTools, createShellTools, createThinkingTools, createTimeTools, createWebSearchTools, } from "../tools/index.js";
|
|
13
12
|
import { createSessionModePromptPlugin } from "../prompts/session-mode-appendix.js";
|
|
14
13
|
import { clearAgentSkillsPromptInjectionState, createAgentSkillsPlugin, } from "../skills/index.js";
|
|
15
14
|
import { createPromptCachePlugin } from "./prompt-cache-plugin.js";
|
|
15
|
+
import { createSessionTitlePlugin, } from "./session-title-plugin.js";
|
|
16
16
|
import { ModeAwareToolRegistry } from "./mode-aware-tool-registry.js";
|
|
17
17
|
import { applySessionMode } from "./sync-tool-registry-mode.js";
|
|
18
18
|
import { clearTodoState } from "../state/todos.js";
|
|
19
19
|
import { MODE_STATE_KEY } from "../state/session-mode.js";
|
|
20
20
|
import { YOLO_STATE_KEY } from "../state/yolo.js";
|
|
21
|
-
import { memoryPath, sessionsPath } from "../utils/paths.js";
|
|
21
|
+
import { memoryPath, offloadedContentPath, sessionsPath, } from "../utils/paths.js";
|
|
22
22
|
const SECTION_BREAK = "\n\n---\n\n";
|
|
23
|
-
const OFFLOADED_CONTENT_DIR = "offloaded-content";
|
|
24
23
|
const OFFLOADING_MAX_RESULT_TOKENS = 5_000;
|
|
25
24
|
const OFFLOADING_PREVIEW_TOKENS = 2_000;
|
|
26
25
|
const MEMORY_STORE_NAME = "long_term";
|
|
@@ -62,6 +61,11 @@ export async function create(config, system, mcp, print = false, meta) {
|
|
|
62
61
|
const promptCachePlugin = createPromptCachePlugin({
|
|
63
62
|
getProvider: () => config.llm.provider,
|
|
64
63
|
});
|
|
64
|
+
// AI session titles from the first user prompt (staged on appState so the
|
|
65
|
+
// session manager's snapshot save persists them).
|
|
66
|
+
const sessionTitlePlugin = createSessionTitlePlugin({
|
|
67
|
+
onTitle: meta.onSessionTitle,
|
|
68
|
+
});
|
|
65
69
|
async function buildBaseSystemPrompt() {
|
|
66
70
|
await system.reload();
|
|
67
71
|
const appendNext = await mcp.manager.listServerInstructions();
|
|
@@ -78,6 +82,7 @@ export async function create(config, system, mcp, print = false, meta) {
|
|
|
78
82
|
...(config.tools.filesystem.enabled ? createGrepTools() : []),
|
|
79
83
|
...(config.tools.shell.enabled ? createShellTools() : []),
|
|
80
84
|
...(config.search.enabled ? createWebSearchTools(config) : []),
|
|
85
|
+
...createAskUserTools(),
|
|
81
86
|
...createThinkingTools(),
|
|
82
87
|
...createPlanTools(),
|
|
83
88
|
...prefixed,
|
|
@@ -108,6 +113,7 @@ export async function create(config, system, mcp, print = false, meta) {
|
|
|
108
113
|
skillsPlugin,
|
|
109
114
|
sessionModePlugin,
|
|
110
115
|
promptCachePlugin,
|
|
116
|
+
sessionTitlePlugin,
|
|
111
117
|
...contextPlugins,
|
|
112
118
|
],
|
|
113
119
|
interventions: meta.interventions ?? [],
|
|
@@ -169,7 +175,7 @@ function createOffloadingPlugins() {
|
|
|
169
175
|
renderContent: async () => `<now>${new Date().toISOString()}</now>`,
|
|
170
176
|
}),
|
|
171
177
|
new ContextOffloader({
|
|
172
|
-
storage: new TolerantFileStorage(
|
|
178
|
+
storage: new TolerantFileStorage(offloadedContentPath()),
|
|
173
179
|
maxResultTokens: OFFLOADING_MAX_RESULT_TOKENS,
|
|
174
180
|
previewTokens: OFFLOADING_PREVIEW_TOKENS,
|
|
175
181
|
includeRetrievalTool: true,
|