hoomanjs 1.34.0 → 1.35.1
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 +43 -7
- package/dist/acp/acp-agent.js +2 -16
- package/dist/acp/acp-agent.js.map +1 -1
- package/dist/acp/sessions/store.d.ts +0 -2
- package/dist/acp/sessions/store.js.map +1 -1
- package/dist/acp/utils/tool-kind.js +10 -2
- package/dist/acp/utils/tool-kind.js.map +1 -1
- package/dist/chat/app.d.ts +2 -1
- package/dist/chat/app.js +89 -4
- package/dist/chat/app.js.map +1 -1
- package/dist/chat/components/BottomChrome.d.ts +6 -2
- package/dist/chat/components/BottomChrome.js +2 -2
- package/dist/chat/components/BottomChrome.js.map +1 -1
- package/dist/chat/components/ChromePicker.d.ts +7 -2
- package/dist/chat/components/ChromePicker.js +8 -1
- package/dist/chat/components/ChromePicker.js.map +1 -1
- package/dist/chat/components/StatusBar.d.ts +1 -2
- package/dist/chat/components/StatusBar.js +3 -12
- package/dist/chat/components/StatusBar.js.map +1 -1
- package/dist/chat/components/ToolEvent.js +1 -1
- package/dist/chat/components/ToolEvent.js.map +1 -1
- package/dist/chat/index.d.ts +2 -1
- package/dist/chat/index.js +7 -0
- package/dist/chat/index.js.map +1 -1
- package/dist/cli.js +120 -4
- package/dist/cli.js.map +1 -1
- package/dist/configure/app.js +5 -5
- package/dist/configure/app.js.map +1 -1
- package/dist/core/agent/index.d.ts +13 -3
- package/dist/core/agent/index.js +79 -12
- package/dist/core/agent/index.js.map +1 -1
- package/dist/core/config.d.ts +9 -7
- package/dist/core/config.js +102 -13
- package/dist/core/config.js.map +1 -1
- package/dist/core/index.d.ts +1 -2
- package/dist/core/index.js +6 -7
- package/dist/core/index.js.map +1 -1
- package/dist/core/mcp/config.d.ts +7 -1
- package/dist/core/mcp/config.js +41 -8
- package/dist/core/mcp/config.js.map +1 -1
- package/dist/core/memory/index.d.ts +1 -0
- package/dist/core/memory/index.js +1 -0
- package/dist/core/memory/index.js.map +1 -1
- package/dist/core/memory/model-extractor.js.map +1 -0
- package/dist/core/modes/definitions.js +6 -2
- package/dist/core/modes/definitions.js.map +1 -1
- package/dist/core/prompts/agents/research.md +8 -4
- package/dist/core/prompts/agents/review.md +26 -0
- package/dist/core/prompts/agents/test-investigator.md +26 -0
- package/dist/core/prompts/modes/ask.md +1 -1
- package/dist/core/prompts/modes/plan.md +1 -1
- package/dist/core/prompts/runtime.js +2 -30
- package/dist/core/prompts/runtime.js.map +1 -1
- package/dist/core/prompts/static/subagents.md +12 -8
- package/dist/core/prompts/system.js +1 -1
- package/dist/core/prompts/system.js.map +1 -1
- package/dist/core/runtime-config.d.ts +16 -0
- package/dist/core/runtime-config.js +44 -0
- package/dist/core/runtime-config.js.map +1 -0
- package/dist/core/session-config.js +2 -1
- package/dist/core/session-config.js.map +1 -1
- package/dist/core/sessions/flat-file-storage.js.map +1 -0
- package/dist/core/sessions/lazy-session-manager.js.map +1 -0
- package/dist/core/sessions/list-cli-sessions.d.ts +12 -0
- package/dist/core/sessions/list-cli-sessions.js +174 -0
- package/dist/core/sessions/list-cli-sessions.js.map +1 -0
- package/dist/core/skills/built-in/hooman-config/SKILL.md +12 -9
- package/dist/core/state/tool-approvals.js +4 -3
- package/dist/core/state/tool-approvals.js.map +1 -1
- package/dist/core/subagents/index.d.ts +2 -3
- package/dist/core/subagents/index.js +2 -3
- package/dist/core/subagents/index.js.map +1 -1
- package/dist/core/subagents/registry.d.ts +22 -0
- package/dist/core/subagents/registry.js +96 -0
- package/dist/core/subagents/registry.js.map +1 -0
- package/dist/core/subagents/tool.d.ts +6 -14
- package/dist/core/subagents/tool.js +73 -53
- package/dist/core/subagents/tool.js.map +1 -1
- package/dist/core/utils/discover-files.d.ts +12 -0
- package/dist/core/utils/discover-files.js +47 -0
- package/dist/core/utils/discover-files.js.map +1 -0
- package/dist/index.d.ts +5 -5
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/dist/acp/meta/system-prompt.d.ts +0 -12
- package/dist/acp/meta/system-prompt.js +0 -41
- package/dist/acp/meta/system-prompt.js.map +0 -1
- package/dist/core/context/flat-file-storage.js.map +0 -1
- package/dist/core/context/index.d.ts +0 -22
- package/dist/core/context/index.js +0 -74
- package/dist/core/context/index.js.map +0 -1
- package/dist/core/context/lazy-session-manager.js.map +0 -1
- package/dist/core/context/model-extractor.js.map +0 -1
- package/dist/core/subagents/research.d.ts +0 -16
- package/dist/core/subagents/research.js +0 -58
- package/dist/core/subagents/research.js.map +0 -1
- package/dist/core/subagents/runner.d.ts +0 -37
- package/dist/core/subagents/runner.js +0 -273
- package/dist/core/subagents/runner.js.map +0 -1
- /package/dist/core/{context → memory}/model-extractor.d.ts +0 -0
- /package/dist/core/{context → memory}/model-extractor.js +0 -0
- /package/dist/core/{context → sessions}/flat-file-storage.d.ts +0 -0
- /package/dist/core/{context → sessions}/flat-file-storage.js +0 -0
- /package/dist/core/{context → sessions}/lazy-session-manager.d.ts +0 -0
- /package/dist/core/{context → sessions}/lazy-session-manager.js +0 -0
|
@@ -1,74 +0,0 @@
|
|
|
1
|
-
import { IntervalTrigger, SessionManager, SummarizingConversationManager, } from "@strands-agents/sdk";
|
|
2
|
-
import { ContextInjector } from "@strands-agents/sdk/vended-plugins/context-injector";
|
|
3
|
-
import { ContextOffloader, FileStorage, } from "@strands-agents/sdk/vended-plugins/context-offloader";
|
|
4
|
-
import { join } from "node:path";
|
|
5
|
-
import { FileMemoryStore } from "../memory/index.js";
|
|
6
|
-
import { memoryPath, sessionsPath } from "../utils/paths.js";
|
|
7
|
-
import { FlatFileStorage } from "./flat-file-storage.js";
|
|
8
|
-
import { LazySessionManager } from "./lazy-session-manager.js";
|
|
9
|
-
import { ToolBasedModelExtractor } from "./model-extractor.js";
|
|
10
|
-
const OFFLOADED_CONTENT_DIR = "offloaded-content";
|
|
11
|
-
const OFFLOADING_MAX_RESULT_TOKENS = 5_000;
|
|
12
|
-
const OFFLOADING_PREVIEW_TOKENS = 2_000;
|
|
13
|
-
const MEMORY_STORE_NAME = "long_term";
|
|
14
|
-
const MEMORY_EXTRACTION_TURNS = 5;
|
|
15
|
-
const MEMORY_MAX_SEARCH_RESULTS = 5;
|
|
16
|
-
export function create(sessionId) {
|
|
17
|
-
const conversationManager = new SummarizingConversationManager({
|
|
18
|
-
summaryRatio: 0.5,
|
|
19
|
-
preserveRecentMessages: 5,
|
|
20
|
-
});
|
|
21
|
-
const storage = new FlatFileStorage(sessionsPath());
|
|
22
|
-
const offloadingPlugins = createOffloadingPlugins();
|
|
23
|
-
const memoryManager = createMemoryManager();
|
|
24
|
-
if (!sessionId) {
|
|
25
|
-
return {
|
|
26
|
-
plugins: [...offloadingPlugins, new LazySessionManager({ storage })],
|
|
27
|
-
conversationManager,
|
|
28
|
-
memoryManager,
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
const sessionManager = new SessionManager({
|
|
32
|
-
sessionId,
|
|
33
|
-
storage: { snapshot: storage },
|
|
34
|
-
});
|
|
35
|
-
return {
|
|
36
|
-
plugins: offloadingPlugins,
|
|
37
|
-
sessionManager,
|
|
38
|
-
conversationManager,
|
|
39
|
-
memoryManager,
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
function createOffloadingPlugins() {
|
|
43
|
-
return [
|
|
44
|
-
new ContextInjector({
|
|
45
|
-
name: "hooman:clock",
|
|
46
|
-
trigger: "userTurn",
|
|
47
|
-
renderContent: async () => `<now>${new Date().toISOString()}</now>`,
|
|
48
|
-
}),
|
|
49
|
-
new ContextOffloader({
|
|
50
|
-
storage: new FileStorage(join(sessionsPath(), OFFLOADED_CONTENT_DIR)),
|
|
51
|
-
maxResultTokens: OFFLOADING_MAX_RESULT_TOKENS,
|
|
52
|
-
previewTokens: OFFLOADING_PREVIEW_TOKENS,
|
|
53
|
-
includeRetrievalTool: true,
|
|
54
|
-
}),
|
|
55
|
-
];
|
|
56
|
-
}
|
|
57
|
-
function createMemoryManager() {
|
|
58
|
-
const store = new FileMemoryStore({
|
|
59
|
-
baseDir: memoryPath(),
|
|
60
|
-
name: MEMORY_STORE_NAME,
|
|
61
|
-
description: "Durable facts, preferences, recurring tasks, and stable context learned about the current user across sessions.",
|
|
62
|
-
maxSearchResults: MEMORY_MAX_SEARCH_RESULTS,
|
|
63
|
-
writable: true,
|
|
64
|
-
extraction: {
|
|
65
|
-
trigger: new IntervalTrigger({ turns: MEMORY_EXTRACTION_TURNS }),
|
|
66
|
-
extractor: new ToolBasedModelExtractor(),
|
|
67
|
-
},
|
|
68
|
-
});
|
|
69
|
-
return {
|
|
70
|
-
stores: [store],
|
|
71
|
-
};
|
|
72
|
-
}
|
|
73
|
-
export { LazySessionManager } from "./lazy-session-manager.js";
|
|
74
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/context/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,cAAc,EACd,8BAA8B,GAC/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,EACL,gBAAgB,EAChB,WAAW,GACZ,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAClD,MAAM,4BAA4B,GAAG,KAAK,CAAC;AAC3C,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAExC,MAAM,iBAAiB,GAAG,WAAW,CAAC;AACtC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAClC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAEpC,MAAM,UAAU,MAAM,CAAC,SAAkB;IACvC,MAAM,mBAAmB,GAAG,IAAI,8BAA8B,CAAC;QAC7D,YAAY,EAAE,GAAG;QACjB,sBAAsB,EAAE,CAAC;KAC1B,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,uBAAuB,EAAE,CAAC;IACpD,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;IAE5C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,CAAC,GAAG,iBAAiB,EAAE,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YACpE,mBAAmB;YACnB,aAAa;SACd,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;QACxC,SAAS;QACT,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE;KAC/B,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,EAAE,iBAAiB;QAC1B,cAAc;QACd,mBAAmB;QACnB,aAAa;KACd,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB;IAC9B,OAAO;QACL,IAAI,eAAe,CAAC;YAClB,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,UAAU;YACnB,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,QAAQ;SACpE,CAAC;QACF,IAAI,gBAAgB,CAAC;YACnB,OAAO,EAAE,IAAI,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,qBAAqB,CAAC,CAAC;YACrE,eAAe,EAAE,4BAA4B;YAC7C,aAAa,EAAE,yBAAyB;YACxC,oBAAoB,EAAE,IAAI;SAC3B,CAAC;KACH,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB;IAC1B,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC;QAChC,OAAO,EAAE,UAAU,EAAE;QACrB,IAAI,EAAE,iBAAiB;QACvB,WAAW,EACT,iHAAiH;QACnH,gBAAgB,EAAE,yBAAyB;QAC3C,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE;YACV,OAAO,EAAE,IAAI,eAAe,CAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;YAChE,SAAS,EAAE,IAAI,uBAAuB,EAAE;SACzC;KACF,CAAC,CAAC;IAEH,OAAO;QACL,MAAM,EAAE,CAAC,KAAK,CAAC;KAChB,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"lazy-session-manager.js","sourceRoot":"","sources":["../../../src/core/context/lazy-session-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"model-extractor.js","sourceRoot":"","sources":["../../../src/core/context/model-extractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import type { Config } from "../config.js";
|
|
2
|
-
export type ResearchSubagentConfig = {
|
|
3
|
-
id: "research";
|
|
4
|
-
name: string;
|
|
5
|
-
instructions: string;
|
|
6
|
-
description: string;
|
|
7
|
-
tools: readonly string[];
|
|
8
|
-
};
|
|
9
|
-
export type ResearchSubagentDefinition = Omit<ResearchSubagentConfig, "instructions"> & {
|
|
10
|
-
instructions: string;
|
|
11
|
-
};
|
|
12
|
-
export declare const RESEARCH_SUBAGENT: ResearchSubagentConfig;
|
|
13
|
-
export declare function loadResearchSubagent(config: Config, options?: {
|
|
14
|
-
knownTools?: readonly string[];
|
|
15
|
-
baseSystemPrompt?: string;
|
|
16
|
-
}): ResearchSubagentDefinition;
|
|
@@ -1,58 +0,0 @@
|
|
|
1
|
-
import handlebars from "handlebars";
|
|
2
|
-
import { hasBundledPrompt, readBundledPrompt } from "../prompts/bundled.js";
|
|
3
|
-
import { getEnvironmentPromptContext } from "../prompts/environment.js";
|
|
4
|
-
const { compile } = handlebars;
|
|
5
|
-
const SECTION_BREAK = "\n\n---\n\n";
|
|
6
|
-
export const RESEARCH_SUBAGENT = {
|
|
7
|
-
id: "research",
|
|
8
|
-
name: "Research",
|
|
9
|
-
instructions: "agents/research.md",
|
|
10
|
-
description: "explores the workspace to gather information",
|
|
11
|
-
tools: [
|
|
12
|
-
"read_file",
|
|
13
|
-
"read_multiple_files",
|
|
14
|
-
"list_directory",
|
|
15
|
-
"directory_tree",
|
|
16
|
-
"grep",
|
|
17
|
-
"get_file_info",
|
|
18
|
-
"fetch",
|
|
19
|
-
"web_search",
|
|
20
|
-
"think",
|
|
21
|
-
],
|
|
22
|
-
};
|
|
23
|
-
function promptContext(config) {
|
|
24
|
-
return {
|
|
25
|
-
name: config.name,
|
|
26
|
-
llm: config.llm,
|
|
27
|
-
environment: getEnvironmentPromptContext(),
|
|
28
|
-
compaction: config.compaction,
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
export function loadResearchSubagent(config, options) {
|
|
32
|
-
const entry = RESEARCH_SUBAGENT;
|
|
33
|
-
const knownTools = options?.knownTools;
|
|
34
|
-
if (!hasBundledPrompt(...entry.instructions.split("/"))) {
|
|
35
|
-
throw new Error(`Subagent '${entry.id}' instructions file not found: ${entry.instructions}`);
|
|
36
|
-
}
|
|
37
|
-
const raw = readBundledPrompt(...entry.instructions.split("/"));
|
|
38
|
-
if (!raw) {
|
|
39
|
-
throw new Error(`Subagent '${entry.id}' instructions file is empty: ${entry.instructions}`);
|
|
40
|
-
}
|
|
41
|
-
const renderedInstructions = compile(raw)(promptContext(config)).trim();
|
|
42
|
-
const instructions = [options?.baseSystemPrompt?.trim(), renderedInstructions]
|
|
43
|
-
.filter(Boolean)
|
|
44
|
-
.join(SECTION_BREAK)
|
|
45
|
-
.trim();
|
|
46
|
-
if (!instructions) {
|
|
47
|
-
throw new Error(`Subagent '${entry.id}' instructions rendered to empty content.`);
|
|
48
|
-
}
|
|
49
|
-
const tools = knownTools
|
|
50
|
-
? entry.tools.filter((toolName) => knownTools.includes(toolName))
|
|
51
|
-
: [...entry.tools];
|
|
52
|
-
return {
|
|
53
|
-
...entry,
|
|
54
|
-
instructions,
|
|
55
|
-
tools,
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
//# sourceMappingURL=research.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"research.js","sourceRoot":"","sources":["../../../src/core/subagents/research.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAExE,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;AAC/B,MAAM,aAAa,GAAG,aAAa,CAAC;AAiBpC,MAAM,CAAC,MAAM,iBAAiB,GAA2B;IACvD,EAAE,EAAE,UAAU;IACd,IAAI,EAAE,UAAU;IAChB,YAAY,EAAE,oBAAoB;IAClC,WAAW,EAAE,8CAA8C;IAC3D,KAAK,EAAE;QACL,WAAW;QACX,qBAAqB;QACrB,gBAAgB;QAChB,gBAAgB;QAChB,MAAM;QACN,eAAe;QACf,OAAO;QACP,YAAY;QACZ,OAAO;KACR;CACF,CAAC;AAEF,SAAS,aAAa,CAAC,MAAc;IACnC,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,WAAW,EAAE,2BAA2B,EAAE;QAC1C,UAAU,EAAE,MAAM,CAAC,UAAU;KAC9B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,MAAc,EACd,OAAuE;IAEvE,MAAM,KAAK,GAAG,iBAAiB,CAAC;IAChC,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,CAAC;IACvC,IAAI,CAAC,gBAAgB,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CACb,aAAa,KAAK,CAAC,EAAE,kCAAkC,KAAK,CAAC,YAAY,EAAE,CAC5E,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,iBAAiB,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CACb,aAAa,KAAK,CAAC,EAAE,iCAAiC,KAAK,CAAC,YAAY,EAAE,CAC3E,CAAC;IACJ,CAAC;IAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACxE,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAE,oBAAoB,CAAC;SAC3E,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,aAAa,CAAC;SACnB,IAAI,EAAE,CAAC;IAEV,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACb,aAAa,KAAK,CAAC,EAAE,2CAA2C,CACjE,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,UAAU;QACtB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IAErB,OAAO;QACL,GAAG,KAAK;QACR,YAAY;QACZ,KAAK;KACN,CAAC;AACJ,CAAC"}
|
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
import type { BaseModelConfig, Model, Tool } from "@strands-agents/sdk";
|
|
2
|
-
import type { ResearchSubagentDefinition } from "./research.js";
|
|
3
|
-
export type AgentJob = {
|
|
4
|
-
id: string;
|
|
5
|
-
kind: string;
|
|
6
|
-
description: string;
|
|
7
|
-
prompt: string;
|
|
8
|
-
};
|
|
9
|
-
export type AgentJobResult = {
|
|
10
|
-
id: string;
|
|
11
|
-
kind: string;
|
|
12
|
-
description: string;
|
|
13
|
-
status: "completed" | "failed";
|
|
14
|
-
content: string;
|
|
15
|
-
durationMs: number;
|
|
16
|
-
error: string | null;
|
|
17
|
-
stopReason: string | null;
|
|
18
|
-
};
|
|
19
|
-
export type RunAgentJobsResult = {
|
|
20
|
-
results: AgentJobResult[];
|
|
21
|
-
};
|
|
22
|
-
type RunAgentJobsOptions = {
|
|
23
|
-
jobs: readonly AgentJob[];
|
|
24
|
-
research: ResearchSubagentDefinition;
|
|
25
|
-
tools: readonly Tool[];
|
|
26
|
-
createModel: () => Model<BaseModelConfig>;
|
|
27
|
-
concurrency: number;
|
|
28
|
-
parent: string;
|
|
29
|
-
appState: {
|
|
30
|
-
userId?: string;
|
|
31
|
-
sessionId?: string;
|
|
32
|
-
};
|
|
33
|
-
cancelSignal?: AbortSignal;
|
|
34
|
-
};
|
|
35
|
-
type RunSubagentJobsOptions = RunAgentJobsOptions;
|
|
36
|
-
export declare function runSubagentJobs(options: RunSubagentJobsOptions): Promise<RunAgentJobsResult>;
|
|
37
|
-
export {};
|
|
@@ -1,273 +0,0 @@
|
|
|
1
|
-
import { Agent, TextBlock } from "@strands-agents/sdk";
|
|
2
|
-
import { Graph, Node, Status } from "@strands-agents/sdk/multiagent";
|
|
3
|
-
class JobNode extends Node {
|
|
4
|
-
type = "agentJobNode";
|
|
5
|
-
execute;
|
|
6
|
-
cancelSignal;
|
|
7
|
-
constructor(id, execute, description, cancelSignal) {
|
|
8
|
-
super(id, { description });
|
|
9
|
-
this.execute = execute;
|
|
10
|
-
this.cancelSignal = cancelSignal;
|
|
11
|
-
}
|
|
12
|
-
async *handle(_input, _state, _options) {
|
|
13
|
-
if (this.cancelSignal?.aborted) {
|
|
14
|
-
return {
|
|
15
|
-
status: Status.CANCELLED,
|
|
16
|
-
content: [new TextBlock("Cancelled before job execution.")],
|
|
17
|
-
error: new Error("Cancelled before job execution."),
|
|
18
|
-
};
|
|
19
|
-
}
|
|
20
|
-
const result = await this.execute();
|
|
21
|
-
if (result.status === "completed") {
|
|
22
|
-
const content = result.content.trim()
|
|
23
|
-
? [new TextBlock(result.content.trim())]
|
|
24
|
-
: [];
|
|
25
|
-
return {
|
|
26
|
-
status: Status.COMPLETED,
|
|
27
|
-
content,
|
|
28
|
-
};
|
|
29
|
-
}
|
|
30
|
-
return {
|
|
31
|
-
status: result.stopReason === "cancelled" ? Status.CANCELLED : Status.FAILED,
|
|
32
|
-
content: result.error ? [new TextBlock(result.error)] : [],
|
|
33
|
-
error: result.error ? new Error(result.error) : undefined,
|
|
34
|
-
};
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
function buildJobPrompt(job) {
|
|
38
|
-
return `Task: ${job.description}\n\nUser request:\n${job.prompt}`;
|
|
39
|
-
}
|
|
40
|
-
function selectTools(definition, tools) {
|
|
41
|
-
const byName = new Map();
|
|
42
|
-
for (const tool of tools) {
|
|
43
|
-
byName.set(tool.name, tool);
|
|
44
|
-
}
|
|
45
|
-
const selected = [];
|
|
46
|
-
for (const name of definition.tools) {
|
|
47
|
-
const tool = byName.get(name);
|
|
48
|
-
if (!tool) {
|
|
49
|
-
throw new Error(`Subagent '${definition.id}' cannot access missing tool '${name}'.`);
|
|
50
|
-
}
|
|
51
|
-
selected.push(tool);
|
|
52
|
-
}
|
|
53
|
-
return selected;
|
|
54
|
-
}
|
|
55
|
-
async function runSingleJob(job, definition, options) {
|
|
56
|
-
const started = Date.now();
|
|
57
|
-
if (options.cancelSignal?.aborted) {
|
|
58
|
-
return {
|
|
59
|
-
id: job.id,
|
|
60
|
-
kind: job.kind,
|
|
61
|
-
description: job.description,
|
|
62
|
-
status: "failed",
|
|
63
|
-
content: "",
|
|
64
|
-
durationMs: 0,
|
|
65
|
-
error: "Cancelled before execution.",
|
|
66
|
-
stopReason: "cancelled",
|
|
67
|
-
};
|
|
68
|
-
}
|
|
69
|
-
try {
|
|
70
|
-
const child = new Agent({
|
|
71
|
-
name: `${options.parent}-${definition.id}-${job.id}`,
|
|
72
|
-
systemPrompt: definition.instructions,
|
|
73
|
-
model: options.createModel(),
|
|
74
|
-
appState: {
|
|
75
|
-
...(options.appState.userId ? { userId: options.appState.userId } : {}),
|
|
76
|
-
...(options.appState.sessionId
|
|
77
|
-
? { sessionId: options.appState.sessionId }
|
|
78
|
-
: {}),
|
|
79
|
-
string: definition.id,
|
|
80
|
-
},
|
|
81
|
-
tools: [...selectTools(definition, options.tools)],
|
|
82
|
-
printer: false,
|
|
83
|
-
});
|
|
84
|
-
const result = await child.invoke(buildJobPrompt(job), {
|
|
85
|
-
...(options.cancelSignal ? { cancelSignal: options.cancelSignal } : {}),
|
|
86
|
-
});
|
|
87
|
-
return {
|
|
88
|
-
id: job.id,
|
|
89
|
-
kind: job.kind,
|
|
90
|
-
description: job.description,
|
|
91
|
-
status: result.stopReason === "cancelled" ? "failed" : "completed",
|
|
92
|
-
content: result.toString().trim(),
|
|
93
|
-
durationMs: Date.now() - started,
|
|
94
|
-
error: result.stopReason === "cancelled" ? "Cancelled." : null,
|
|
95
|
-
stopReason: result.stopReason,
|
|
96
|
-
};
|
|
97
|
-
}
|
|
98
|
-
catch (error) {
|
|
99
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
100
|
-
const cancelled = options.cancelSignal?.aborted ?? false;
|
|
101
|
-
return {
|
|
102
|
-
id: job.id,
|
|
103
|
-
kind: job.kind,
|
|
104
|
-
description: job.description,
|
|
105
|
-
status: "failed",
|
|
106
|
-
content: "",
|
|
107
|
-
durationMs: Date.now() - started,
|
|
108
|
-
error: message,
|
|
109
|
-
stopReason: cancelled ? "cancelled" : null,
|
|
110
|
-
};
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
function contentToText(content) {
|
|
114
|
-
return content
|
|
115
|
-
.map((block) => {
|
|
116
|
-
if ("text" in block && typeof block.text === "string") {
|
|
117
|
-
return block.text;
|
|
118
|
-
}
|
|
119
|
-
return "";
|
|
120
|
-
})
|
|
121
|
-
.filter(Boolean)
|
|
122
|
-
.join("\n")
|
|
123
|
-
.trim();
|
|
124
|
-
}
|
|
125
|
-
function cancelledResult(job, message) {
|
|
126
|
-
return {
|
|
127
|
-
id: job.id,
|
|
128
|
-
kind: job.kind,
|
|
129
|
-
description: job.description,
|
|
130
|
-
status: "failed",
|
|
131
|
-
content: "",
|
|
132
|
-
durationMs: 0,
|
|
133
|
-
error: message,
|
|
134
|
-
stopReason: "cancelled",
|
|
135
|
-
};
|
|
136
|
-
}
|
|
137
|
-
export async function runSubagentJobs(options) {
|
|
138
|
-
if (options.jobs.length === 0) {
|
|
139
|
-
return { results: [] };
|
|
140
|
-
}
|
|
141
|
-
if (options.cancelSignal?.aborted) {
|
|
142
|
-
return {
|
|
143
|
-
results: options.jobs.map((job) => ({
|
|
144
|
-
id: job.id,
|
|
145
|
-
kind: job.kind,
|
|
146
|
-
description: job.description,
|
|
147
|
-
status: "failed",
|
|
148
|
-
content: "",
|
|
149
|
-
durationMs: 0,
|
|
150
|
-
error: "Cancelled before execution.",
|
|
151
|
-
stopReason: "cancelled",
|
|
152
|
-
})),
|
|
153
|
-
};
|
|
154
|
-
}
|
|
155
|
-
const ordered = [...options.jobs];
|
|
156
|
-
const results = ordered.map(() => null);
|
|
157
|
-
const graphNodes = [];
|
|
158
|
-
const graphSources = [];
|
|
159
|
-
const nodeToIndex = new Map();
|
|
160
|
-
const graphNodeResults = new Map();
|
|
161
|
-
for (const [index, job] of ordered.entries()) {
|
|
162
|
-
if (job.kind !== options.research.id) {
|
|
163
|
-
results[index] = {
|
|
164
|
-
id: job.id,
|
|
165
|
-
kind: job.kind,
|
|
166
|
-
description: job.description,
|
|
167
|
-
status: "failed",
|
|
168
|
-
content: "",
|
|
169
|
-
durationMs: 0,
|
|
170
|
-
error: `Unknown agent kind '${job.kind}'.`,
|
|
171
|
-
stopReason: null,
|
|
172
|
-
};
|
|
173
|
-
continue;
|
|
174
|
-
}
|
|
175
|
-
const nodeId = `${job.id}__${index + 1}`;
|
|
176
|
-
nodeToIndex.set(nodeId, index);
|
|
177
|
-
graphSources.push(nodeId);
|
|
178
|
-
graphNodes.push(new JobNode(nodeId, async () => {
|
|
179
|
-
const jobResult = await runSingleJob(job, options.research, {
|
|
180
|
-
tools: options.tools,
|
|
181
|
-
createModel: options.createModel,
|
|
182
|
-
parent: options.parent,
|
|
183
|
-
appState: options.appState,
|
|
184
|
-
cancelSignal: options.cancelSignal,
|
|
185
|
-
});
|
|
186
|
-
graphNodeResults.set(nodeId, jobResult);
|
|
187
|
-
return jobResult;
|
|
188
|
-
}, `${job.kind} :: ${job.description}`, options.cancelSignal));
|
|
189
|
-
}
|
|
190
|
-
if (graphNodes.length > 0) {
|
|
191
|
-
try {
|
|
192
|
-
const graph = new Graph({
|
|
193
|
-
id: "run_subagents_graph",
|
|
194
|
-
nodes: graphNodes,
|
|
195
|
-
edges: [],
|
|
196
|
-
sources: graphSources,
|
|
197
|
-
maxConcurrency: Math.max(1, Math.min(options.concurrency, graphNodes.length)),
|
|
198
|
-
});
|
|
199
|
-
const graphRun = graph.invoke("run jobs");
|
|
200
|
-
const graphResult = options.cancelSignal
|
|
201
|
-
? await Promise.race([
|
|
202
|
-
graphRun,
|
|
203
|
-
new Promise((resolve) => {
|
|
204
|
-
const onAbort = () => resolve(null);
|
|
205
|
-
options.cancelSignal?.addEventListener("abort", onAbort, {
|
|
206
|
-
once: true,
|
|
207
|
-
});
|
|
208
|
-
}),
|
|
209
|
-
])
|
|
210
|
-
: await graphRun;
|
|
211
|
-
if (graphResult === null) {
|
|
212
|
-
for (const [nodeId, index] of nodeToIndex.entries()) {
|
|
213
|
-
if (results[index]) {
|
|
214
|
-
continue;
|
|
215
|
-
}
|
|
216
|
-
const recorded = graphNodeResults.get(nodeId);
|
|
217
|
-
results[index] =
|
|
218
|
-
recorded ?? cancelledResult(ordered[index], "Cancelled.");
|
|
219
|
-
}
|
|
220
|
-
return {
|
|
221
|
-
results: results.filter((entry) => entry !== null),
|
|
222
|
-
};
|
|
223
|
-
}
|
|
224
|
-
const nodeResultsById = new Map(graphResult.results.map((entry) => [entry.nodeId, entry]));
|
|
225
|
-
for (const [nodeId, index] of nodeToIndex.entries()) {
|
|
226
|
-
const recorded = graphNodeResults.get(nodeId);
|
|
227
|
-
if (recorded) {
|
|
228
|
-
results[index] = recorded;
|
|
229
|
-
continue;
|
|
230
|
-
}
|
|
231
|
-
const nodeResult = nodeResultsById.get(nodeId);
|
|
232
|
-
const job = ordered[index];
|
|
233
|
-
const cancelled = options.cancelSignal?.aborted ?? false;
|
|
234
|
-
results[index] = {
|
|
235
|
-
id: job.id,
|
|
236
|
-
kind: job.kind,
|
|
237
|
-
description: job.description,
|
|
238
|
-
status: nodeResult?.status === Status.COMPLETED ? "completed" : "failed",
|
|
239
|
-
content: nodeResult ? contentToText(nodeResult.content) : "",
|
|
240
|
-
durationMs: nodeResult?.duration ?? 0,
|
|
241
|
-
error: nodeResult?.error?.message ??
|
|
242
|
-
"Job did not produce a result from Graph execution.",
|
|
243
|
-
stopReason: nodeResult?.status === Status.CANCELLED || cancelled
|
|
244
|
-
? "cancelled"
|
|
245
|
-
: null,
|
|
246
|
-
};
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
catch (error) {
|
|
250
|
-
const message = error instanceof Error ? error.message : "Graph execution failed.";
|
|
251
|
-
for (const [, index] of nodeToIndex.entries()) {
|
|
252
|
-
if (results[index]) {
|
|
253
|
-
continue;
|
|
254
|
-
}
|
|
255
|
-
const job = ordered[index];
|
|
256
|
-
results[index] = {
|
|
257
|
-
id: job.id,
|
|
258
|
-
kind: job.kind,
|
|
259
|
-
description: job.description,
|
|
260
|
-
status: "failed",
|
|
261
|
-
content: "",
|
|
262
|
-
durationMs: 0,
|
|
263
|
-
error: message,
|
|
264
|
-
stopReason: options.cancelSignal?.aborted ? "cancelled" : null,
|
|
265
|
-
};
|
|
266
|
-
}
|
|
267
|
-
}
|
|
268
|
-
}
|
|
269
|
-
return {
|
|
270
|
-
results: results.filter((entry) => entry !== null),
|
|
271
|
-
};
|
|
272
|
-
}
|
|
273
|
-
//# sourceMappingURL=runner.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/core/subagents/runner.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|