@tyvm/knowhow 0.0.146 → 0.0.148
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/autodoc/cli-reference.md +36 -7
- package/bin/knowhow.js +8 -6
- package/package.json +1 -1
- package/src/agents/base/base.ts +51 -23
- package/src/agents/historyRollback.ts +36 -0
- package/src/agents/tools/execCommand.ts +102 -320
- package/src/agents/tools/list.ts +2 -2
- package/src/agents/tools/startAgentTask.ts +91 -34
- package/src/ai.ts +4 -1
- package/src/auth/browserLogin.ts +9 -3
- package/src/auth/keyAuth.ts +115 -0
- package/src/auth/keyManager.ts +166 -0
- package/src/chat/CliChatService.ts +23 -2
- package/src/chat/modules/AgentModule.ts +114 -33
- package/src/chat/modules/AskModule.ts +2 -0
- package/src/chat/modules/BaseChatModule.ts +0 -1
- package/src/chat/modules/CustomCommandsModule.ts +2 -0
- package/src/chat/modules/InternalChatModule.ts +7 -0
- package/src/chat/modules/RemoteSyncModule.ts +4 -0
- package/src/chat/modules/RendererModule.ts +2 -0
- package/src/chat/modules/SearchModule.ts +2 -0
- package/src/chat/modules/SessionsModule.ts +103 -34
- package/src/chat/modules/SetupModule.ts +2 -0
- package/src/chat/modules/ShellCommandModule.ts +2 -0
- package/src/chat/modules/SystemModule.ts +2 -0
- package/src/chat/modules/ToolCommandModule.ts +102 -0
- package/src/chat/modules/index.ts +1 -0
- package/src/chat/types.ts +3 -1
- package/src/cli.ts +10 -3
- package/src/clients/http.ts +67 -7
- package/src/clients/index.ts +4 -0
- package/src/commands/agent.ts +1 -38
- package/src/commands/agents.ts +455 -60
- package/src/commands/misc.ts +3 -2
- package/src/commands/processes.ts +138 -0
- package/src/commands/services.ts +23 -1
- package/src/index.ts +1 -0
- package/src/login.ts +89 -28
- package/src/processes/ProcessManager.ts +95 -0
- package/src/processes/managedProcessShim.ts +115 -0
- package/src/services/AgentService.ts +2 -0
- package/src/services/AgentSyncFs.ts +77 -1
- package/src/services/AgentSyncKnowhowWeb.ts +22 -4
- package/src/services/BehaviorsService.ts +2 -0
- package/src/services/DockerService.ts +2 -0
- package/src/services/EmbeddingService.ts +2 -0
- package/src/services/EmbeddingsService.ts +3 -0
- package/src/services/ExtensionsService.ts +25 -0
- package/src/services/KnowhowClient.ts +68 -7
- package/src/services/LazyToolsService.ts +24 -20
- package/src/services/Mcp.ts +2 -0
- package/src/services/McpServer.ts +2 -0
- package/src/services/MessageProcessor.ts +2 -0
- package/src/services/MinimalToolsService.ts +2 -0
- package/src/services/SessionManager.ts +5 -0
- package/src/services/SkillsService.ts +2 -0
- package/src/services/SyncedAgentWatcher.ts +2 -0
- package/src/services/SyncerService.ts +23 -8
- package/src/services/TaskRegistry.ts +2 -0
- package/src/services/Tools.ts +12 -0
- package/src/services/index.ts +6 -0
- package/src/services/modules/index.ts +10 -1
- package/src/services/modules/types.ts +4 -0
- package/src/types.ts +2 -0
- package/src/util/Trace.ts +1 -1
- package/src/utils/http.ts +18 -2
- package/tests/unit/agents/historyRollback.test.ts +53 -0
- package/tests/unit/auth/keyAuth.test.ts +102 -0
- package/tests/unit/auth/keyManager.test.ts +67 -0
- package/tests/unit/chat/ToolCommandModule.test.ts +71 -0
- package/tests/unit/chat/historyCommandArgs.test.ts +37 -0
- package/tests/unit/commands/agents.test.ts +111 -0
- package/tests/unit/login.test.ts +119 -0
- package/tests/unit/services/AgentSyncKnowhowWeb.test.ts +38 -0
- package/tests/unit/services/LazyToolsService.test.ts +53 -0
- package/tests/unit/services/SessionManager.test.ts +43 -0
- package/tests/unit/services/SyncerService.test.ts +45 -0
- package/tests/unit/util/Trace.test.ts +119 -0
- package/tests/unit/utils/http.test.ts +43 -0
- package/ts_build/package.json +1 -1
- package/ts_build/src/agents/base/base.d.ts +2 -1
- package/ts_build/src/agents/base/base.js +47 -14
- package/ts_build/src/agents/base/base.js.map +1 -1
- package/ts_build/src/agents/historyRollback.d.ts +2 -0
- package/ts_build/src/agents/historyRollback.js +22 -0
- package/ts_build/src/agents/historyRollback.js.map +1 -0
- package/ts_build/src/agents/tools/execCommand.d.ts +4 -1
- package/ts_build/src/agents/tools/execCommand.js +100 -223
- package/ts_build/src/agents/tools/execCommand.js.map +1 -1
- package/ts_build/src/agents/tools/list.js +2 -2
- package/ts_build/src/agents/tools/list.js.map +1 -1
- package/ts_build/src/agents/tools/startAgentTask.d.ts +16 -1
- package/ts_build/src/agents/tools/startAgentTask.js +71 -28
- package/ts_build/src/agents/tools/startAgentTask.js.map +1 -1
- package/ts_build/src/ai.js +2 -1
- package/ts_build/src/ai.js.map +1 -1
- package/ts_build/src/auth/browserLogin.d.ts +1 -0
- package/ts_build/src/auth/browserLogin.js +5 -2
- package/ts_build/src/auth/browserLogin.js.map +1 -1
- package/ts_build/src/auth/keyAuth.d.ts +5 -0
- package/ts_build/src/auth/keyAuth.js +79 -0
- package/ts_build/src/auth/keyAuth.js.map +1 -0
- package/ts_build/src/auth/keyManager.d.ts +14 -0
- package/ts_build/src/auth/keyManager.js +145 -0
- package/ts_build/src/auth/keyManager.js.map +1 -0
- package/ts_build/src/chat/CliChatService.d.ts +6 -0
- package/ts_build/src/chat/CliChatService.js +17 -2
- package/ts_build/src/chat/CliChatService.js.map +1 -1
- package/ts_build/src/chat/modules/AgentModule.d.ts +13 -1
- package/ts_build/src/chat/modules/AgentModule.js +83 -24
- package/ts_build/src/chat/modules/AgentModule.js.map +1 -1
- package/ts_build/src/chat/modules/AskModule.js +12 -2
- package/ts_build/src/chat/modules/AskModule.js.map +1 -1
- package/ts_build/src/chat/modules/BaseChatModule.js.map +1 -1
- package/ts_build/src/chat/modules/CustomCommandsModule.js +12 -2
- package/ts_build/src/chat/modules/CustomCommandsModule.js.map +1 -1
- package/ts_build/src/chat/modules/InternalChatModule.d.ts +1 -0
- package/ts_build/src/chat/modules/InternalChatModule.js +21 -2
- package/ts_build/src/chat/modules/InternalChatModule.js.map +1 -1
- package/ts_build/src/chat/modules/RemoteSyncModule.js +19 -2
- package/ts_build/src/chat/modules/RemoteSyncModule.js.map +1 -1
- package/ts_build/src/chat/modules/RendererModule.js +17 -2
- package/ts_build/src/chat/modules/RendererModule.js.map +1 -1
- package/ts_build/src/chat/modules/SearchModule.js +12 -2
- package/ts_build/src/chat/modules/SearchModule.js.map +1 -1
- package/ts_build/src/chat/modules/SessionsModule.d.ts +6 -0
- package/ts_build/src/chat/modules/SessionsModule.js +113 -18
- package/ts_build/src/chat/modules/SessionsModule.js.map +1 -1
- package/ts_build/src/chat/modules/SetupModule.js +17 -2
- package/ts_build/src/chat/modules/SetupModule.js.map +1 -1
- package/ts_build/src/chat/modules/ShellCommandModule.js +12 -2
- package/ts_build/src/chat/modules/ShellCommandModule.js.map +1 -1
- package/ts_build/src/chat/modules/SystemModule.js +12 -2
- package/ts_build/src/chat/modules/SystemModule.js.map +1 -1
- package/ts_build/src/chat/modules/ToolCommandModule.d.ts +10 -0
- package/ts_build/src/chat/modules/ToolCommandModule.js +86 -0
- package/ts_build/src/chat/modules/ToolCommandModule.js.map +1 -0
- package/ts_build/src/chat/modules/index.d.ts +1 -0
- package/ts_build/src/chat/modules/index.js +3 -1
- package/ts_build/src/chat/modules/index.js.map +1 -1
- package/ts_build/src/chat/types.d.ts +3 -1
- package/ts_build/src/cli.js +7 -3
- package/ts_build/src/cli.js.map +1 -1
- package/ts_build/src/clients/http.d.ts +4 -0
- package/ts_build/src/clients/http.js +68 -6
- package/ts_build/src/clients/http.js.map +1 -1
- package/ts_build/src/clients/index.js +23 -4
- package/ts_build/src/clients/index.js.map +1 -1
- package/ts_build/src/commands/agent.js +1 -21
- package/ts_build/src/commands/agent.js.map +1 -1
- package/ts_build/src/commands/agents.d.ts +2 -1
- package/ts_build/src/commands/agents.js +216 -23
- package/ts_build/src/commands/agents.js.map +1 -1
- package/ts_build/src/commands/misc.js +3 -2
- package/ts_build/src/commands/misc.js.map +1 -1
- package/ts_build/src/commands/processes.d.ts +2 -0
- package/ts_build/src/commands/processes.js +213 -0
- package/ts_build/src/commands/processes.js.map +1 -0
- package/ts_build/src/commands/services.js +11 -1
- package/ts_build/src/commands/services.js.map +1 -1
- package/ts_build/src/index.d.ts +1 -0
- package/ts_build/src/index.js +1 -0
- package/ts_build/src/index.js.map +1 -1
- package/ts_build/src/login.d.ts +1 -1
- package/ts_build/src/login.js +53 -15
- package/ts_build/src/login.js.map +1 -1
- package/ts_build/src/processes/ProcessManager.d.ts +51 -0
- package/ts_build/src/processes/ProcessManager.js +160 -0
- package/ts_build/src/processes/ProcessManager.js.map +1 -0
- package/ts_build/src/processes/managedProcessShim.d.ts +1 -0
- package/ts_build/src/processes/managedProcessShim.js +161 -0
- package/ts_build/src/processes/managedProcessShim.js.map +1 -0
- package/ts_build/src/services/AgentService.js +18 -2
- package/ts_build/src/services/AgentService.js.map +1 -1
- package/ts_build/src/services/AgentSyncFs.d.ts +3 -0
- package/ts_build/src/services/AgentSyncFs.js +68 -16
- package/ts_build/src/services/AgentSyncFs.js.map +1 -1
- package/ts_build/src/services/AgentSyncKnowhowWeb.d.ts +2 -0
- package/ts_build/src/services/AgentSyncKnowhowWeb.js +28 -6
- package/ts_build/src/services/AgentSyncKnowhowWeb.js.map +1 -1
- package/ts_build/src/services/BehaviorsService.js +12 -2
- package/ts_build/src/services/BehaviorsService.js.map +1 -1
- package/ts_build/src/services/DockerService.js +20 -8
- package/ts_build/src/services/DockerService.js.map +1 -1
- package/ts_build/src/services/EmbeddingService.js +16 -2
- package/ts_build/src/services/EmbeddingService.js.map +1 -1
- package/ts_build/src/services/EmbeddingsService.js +12 -2
- package/ts_build/src/services/EmbeddingsService.js.map +1 -1
- package/ts_build/src/services/ExtensionsService.d.ts +10 -0
- package/ts_build/src/services/ExtensionsService.js +17 -0
- package/ts_build/src/services/ExtensionsService.js.map +1 -0
- package/ts_build/src/services/KnowhowClient.d.ts +7 -2
- package/ts_build/src/services/KnowhowClient.js +108 -10
- package/ts_build/src/services/KnowhowClient.js.map +1 -1
- package/ts_build/src/services/LazyToolsService.d.ts +2 -0
- package/ts_build/src/services/LazyToolsService.js +26 -9
- package/ts_build/src/services/LazyToolsService.js.map +1 -1
- package/ts_build/src/services/Mcp.js +12 -2
- package/ts_build/src/services/Mcp.js.map +1 -1
- package/ts_build/src/services/McpServer.js +17 -2
- package/ts_build/src/services/McpServer.js.map +1 -1
- package/ts_build/src/services/MessageProcessor.js +16 -2
- package/ts_build/src/services/MessageProcessor.js.map +1 -1
- package/ts_build/src/services/MinimalToolsService.js +16 -2
- package/ts_build/src/services/MinimalToolsService.js.map +1 -1
- package/ts_build/src/services/SessionManager.js +19 -2
- package/ts_build/src/services/SessionManager.js.map +1 -1
- package/ts_build/src/services/SkillsService.js +16 -2
- package/ts_build/src/services/SkillsService.js.map +1 -1
- package/ts_build/src/services/SyncedAgentWatcher.js +16 -2
- package/ts_build/src/services/SyncedAgentWatcher.js.map +1 -1
- package/ts_build/src/services/SyncerService.d.ts +1 -0
- package/ts_build/src/services/SyncerService.js +27 -5
- package/ts_build/src/services/SyncerService.js.map +1 -1
- package/ts_build/src/services/TaskRegistry.js +12 -2
- package/ts_build/src/services/TaskRegistry.js.map +1 -1
- package/ts_build/src/services/Tools.d.ts +1 -0
- package/ts_build/src/services/Tools.js +19 -2
- package/ts_build/src/services/Tools.js.map +1 -1
- package/ts_build/src/services/index.d.ts +5 -0
- package/ts_build/src/services/index.js +7 -2
- package/ts_build/src/services/index.js.map +1 -1
- package/ts_build/src/services/modules/index.d.ts +4 -1
- package/ts_build/src/services/modules/index.js +6 -1
- package/ts_build/src/services/modules/index.js.map +1 -1
- package/ts_build/src/services/modules/types.d.ts +3 -0
- package/ts_build/src/types.d.ts +1 -0
- package/ts_build/src/types.js.map +1 -1
- package/ts_build/src/util/Trace.d.ts +1 -3
- package/ts_build/src/utils/http.d.ts +6 -2
- package/ts_build/src/utils/http.js +8 -2
- package/ts_build/src/utils/http.js.map +1 -1
- package/ts_build/tests/unit/agents/historyRollback.test.d.ts +1 -0
- package/ts_build/tests/unit/agents/historyRollback.test.js +42 -0
- package/ts_build/tests/unit/agents/historyRollback.test.js.map +1 -0
- package/ts_build/tests/unit/auth/keyAuth.test.d.ts +1 -0
- package/ts_build/tests/unit/auth/keyAuth.test.js +77 -0
- package/ts_build/tests/unit/auth/keyAuth.test.js.map +1 -0
- package/ts_build/tests/unit/auth/keyManager.test.d.ts +1 -0
- package/ts_build/tests/unit/auth/keyManager.test.js +52 -0
- package/ts_build/tests/unit/auth/keyManager.test.js.map +1 -0
- package/ts_build/tests/unit/chat/ToolCommandModule.test.d.ts +1 -0
- package/ts_build/tests/unit/chat/ToolCommandModule.test.js +61 -0
- package/ts_build/tests/unit/chat/ToolCommandModule.test.js.map +1 -0
- package/ts_build/tests/unit/chat/historyCommandArgs.test.d.ts +1 -0
- package/ts_build/tests/unit/chat/historyCommandArgs.test.js +29 -0
- package/ts_build/tests/unit/chat/historyCommandArgs.test.js.map +1 -0
- package/ts_build/tests/unit/commands/agents.test.d.ts +1 -0
- package/ts_build/tests/unit/commands/agents.test.js +119 -0
- package/ts_build/tests/unit/commands/agents.test.js.map +1 -0
- package/ts_build/tests/unit/login.test.d.ts +1 -0
- package/ts_build/tests/unit/login.test.js +97 -0
- package/ts_build/tests/unit/login.test.js.map +1 -0
- package/ts_build/tests/unit/services/AgentSyncKnowhowWeb.test.d.ts +1 -0
- package/ts_build/tests/unit/services/AgentSyncKnowhowWeb.test.js +32 -0
- package/ts_build/tests/unit/services/AgentSyncKnowhowWeb.test.js.map +1 -0
- package/ts_build/tests/unit/services/LazyToolsService.test.d.ts +1 -0
- package/ts_build/tests/unit/services/LazyToolsService.test.js +47 -0
- package/ts_build/tests/unit/services/LazyToolsService.test.js.map +1 -0
- package/ts_build/tests/unit/services/SessionManager.test.d.ts +1 -0
- package/ts_build/tests/unit/services/SessionManager.test.js +72 -0
- package/ts_build/tests/unit/services/SessionManager.test.js.map +1 -0
- package/ts_build/tests/unit/services/SyncerService.test.d.ts +1 -0
- package/ts_build/tests/unit/services/SyncerService.test.js +40 -0
- package/ts_build/tests/unit/services/SyncerService.test.js.map +1 -0
- package/ts_build/tests/unit/util/Trace.test.d.ts +1 -0
- package/ts_build/tests/unit/util/Trace.test.js +107 -0
- package/ts_build/tests/unit/util/Trace.test.js.map +1 -0
- package/ts_build/tests/unit/utils/http.test.d.ts +1 -0
- package/ts_build/tests/unit/utils/http.test.js +69 -0
- package/ts_build/tests/unit/utils/http.test.js.map +1 -0
|
@@ -77,25 +77,44 @@ function subagentCapabilitiesNote() {
|
|
|
77
77
|
return lines.join("\n");
|
|
78
78
|
}
|
|
79
79
|
async function startAgentTask(params) {
|
|
80
|
-
const { messageId, prompt, taskId: providedTaskId, resume, syncFs, syncRemote, provider, model, agentName, maxTimeLimit, maxSpendLimit, waitForCompletion, parentTaskId: explicitParentTaskId, _ctx, } = params;
|
|
80
|
+
const { messageId, prompt, taskId: providedTaskId, resume, forkTaskId, rollback = 0, syncFs, syncRemote, provider, model, agentName, maxTimeLimit, maxSpendLimit, waitForCompletion, parentTaskId: explicitParentTaskId, _ctx, } = params;
|
|
81
81
|
if (!prompt) {
|
|
82
82
|
throw new Error("prompt is required to create a chat task");
|
|
83
83
|
}
|
|
84
|
+
if (resume && forkTaskId) {
|
|
85
|
+
throw new Error("resume and forkTaskId are mutually exclusive");
|
|
86
|
+
}
|
|
87
|
+
if (resume && !providedTaskId) {
|
|
88
|
+
throw new Error("taskId is required when resuming");
|
|
89
|
+
}
|
|
90
|
+
if (!Number.isInteger(rollback) || rollback < 0) {
|
|
91
|
+
throw new Error("rollback must be a non-negative integer");
|
|
92
|
+
}
|
|
93
|
+
if (rollback > 0 && !resume && !forkTaskId) {
|
|
94
|
+
throw new Error("rollback requires resume or forkTaskId");
|
|
95
|
+
}
|
|
84
96
|
const useSyncFs = syncFs !== false && !messageId;
|
|
85
97
|
const taskId = providedTaskId ?? generateTaskId(prompt);
|
|
86
98
|
const agentTaskDir = path.join(AGENTS_DIR, taskId);
|
|
87
99
|
const parentTaskId = explicitParentTaskId ?? _ctx?.taskId ?? _ctx?.caller?.currentTaskId;
|
|
88
|
-
const
|
|
100
|
+
const isHistoryRun = !!resume || !!forkTaskId;
|
|
101
|
+
const args = resume
|
|
102
|
+
? ["agents", "resume", providedTaskId]
|
|
103
|
+
: forkTaskId
|
|
104
|
+
? ["agents", "fork", forkTaskId]
|
|
105
|
+
: ["agent"];
|
|
106
|
+
if (forkTaskId)
|
|
107
|
+
args.push("--task-id", taskId);
|
|
89
108
|
if (messageId) {
|
|
90
109
|
args.push("--message-id", messageId);
|
|
91
110
|
}
|
|
92
111
|
else if (useSyncFs) {
|
|
93
112
|
args.push("--sync-fs");
|
|
94
113
|
}
|
|
95
|
-
if (syncRemote) {
|
|
114
|
+
if (syncRemote && !isHistoryRun) {
|
|
96
115
|
args.push("--sync-remote");
|
|
97
116
|
}
|
|
98
|
-
if (useSyncFs || providedTaskId) {
|
|
117
|
+
if (!isHistoryRun && (useSyncFs || providedTaskId)) {
|
|
99
118
|
args.push("--task-id", taskId);
|
|
100
119
|
}
|
|
101
120
|
if (provider) {
|
|
@@ -107,17 +126,17 @@ async function startAgentTask(params) {
|
|
|
107
126
|
if (agentName) {
|
|
108
127
|
args.push("--agent-name", agentName);
|
|
109
128
|
}
|
|
110
|
-
if (maxTimeLimit !== undefined) {
|
|
129
|
+
if (maxTimeLimit !== undefined && !isHistoryRun) {
|
|
111
130
|
args.push("--max-time-limit", String(maxTimeLimit));
|
|
112
131
|
}
|
|
113
|
-
if (maxSpendLimit !== undefined) {
|
|
132
|
+
if (maxSpendLimit !== undefined && !isHistoryRun) {
|
|
114
133
|
args.push("--max-spend-limit", String(maxSpendLimit));
|
|
115
134
|
}
|
|
116
|
-
if (parentTaskId) {
|
|
135
|
+
if (parentTaskId && !isHistoryRun) {
|
|
117
136
|
args.push("--parent-task-id", parentTaskId);
|
|
118
137
|
}
|
|
119
|
-
if (
|
|
120
|
-
args.push("--
|
|
138
|
+
if (rollback > 0) {
|
|
139
|
+
args.push("--rollback", String(rollback));
|
|
121
140
|
}
|
|
122
141
|
const timeoutMs = maxTimeLimit ? maxTimeLimit * 60 * 1000 : 60 * 60 * 1000;
|
|
123
142
|
fs.mkdirSync(PROCESSES_DIR, { recursive: true });
|
|
@@ -141,7 +160,8 @@ async function startAgentTask(params) {
|
|
|
141
160
|
child.stdin.end();
|
|
142
161
|
return new Promise((resolve) => {
|
|
143
162
|
let settled = false;
|
|
144
|
-
|
|
163
|
+
let exited = false;
|
|
164
|
+
const done = (result) => {
|
|
145
165
|
if (settled)
|
|
146
166
|
return;
|
|
147
167
|
settled = true;
|
|
@@ -149,31 +169,46 @@ async function startAgentTask(params) {
|
|
|
149
169
|
fs.closeSync(fd);
|
|
150
170
|
}
|
|
151
171
|
catch { }
|
|
152
|
-
resolve(
|
|
172
|
+
resolve(result);
|
|
153
173
|
};
|
|
154
174
|
child.once("error", (e) => {
|
|
155
|
-
done(
|
|
175
|
+
done({
|
|
176
|
+
success: false, status: "failed", taskId, pid, syncFs: useSyncFs,
|
|
177
|
+
syncReady: false, agentDir: useSyncFs ? agentTaskDir : undefined,
|
|
178
|
+
logPath, parentTaskId, error: String(e),
|
|
179
|
+
});
|
|
156
180
|
});
|
|
157
|
-
const syncFsNote = useSyncFs
|
|
158
|
-
? `\nTask ID: ${taskId}\nAgent dir: ${agentTaskDir}\n` +
|
|
159
|
-
`To send agent messages, write to: ${agentTaskDir}/input.txt\n` +
|
|
160
|
-
`To check status, read: ${agentTaskDir}/status.txt\n`
|
|
161
|
-
: "";
|
|
162
181
|
child.once("exit", (code) => {
|
|
163
|
-
|
|
164
|
-
|
|
182
|
+
exited = true;
|
|
183
|
+
done({
|
|
184
|
+
success: code === 0, status: code === 0 ? "completed" : "failed",
|
|
185
|
+
taskId, pid, syncFs: useSyncFs,
|
|
186
|
+
syncReady: useSyncFs && fs.existsSync(path.join(agentTaskDir, "metadata.json")),
|
|
187
|
+
agentDir: useSyncFs ? agentTaskDir : undefined, logPath, parentTaskId,
|
|
188
|
+
exitCode: code, ...(code === 0 ? {} : { error: `Agent exited with code ${code}` }),
|
|
189
|
+
});
|
|
165
190
|
});
|
|
166
191
|
if (!waitForCompletion) {
|
|
167
|
-
const
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
192
|
+
const deadline = Date.now() + (useSyncFs ? 5000 : 100);
|
|
193
|
+
const acknowledge = () => {
|
|
194
|
+
if (settled || exited)
|
|
195
|
+
return;
|
|
196
|
+
const syncReady = useSyncFs && fs.existsSync(path.join(agentTaskDir, "metadata.json"));
|
|
197
|
+
if (!useSyncFs || syncReady || Date.now() >= deadline) {
|
|
198
|
+
try {
|
|
199
|
+
child.unref();
|
|
200
|
+
}
|
|
201
|
+
catch { }
|
|
202
|
+
done({
|
|
203
|
+
success: true, status: "started", taskId, pid, syncFs: useSyncFs,
|
|
204
|
+
syncReady, agentDir: useSyncFs ? agentTaskDir : undefined,
|
|
205
|
+
logPath, parentTaskId,
|
|
206
|
+
});
|
|
207
|
+
return;
|
|
171
208
|
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
syncFsNote);
|
|
176
|
-
}, detachTime);
|
|
209
|
+
setTimeout(acknowledge, 100);
|
|
210
|
+
};
|
|
211
|
+
setTimeout(acknowledge, 50);
|
|
177
212
|
}
|
|
178
213
|
});
|
|
179
214
|
}
|
|
@@ -236,6 +271,14 @@ exports.startAgentTaskDefinition = {
|
|
|
236
271
|
type: "boolean",
|
|
237
272
|
description: "Resume a previously started task from where it left off. Must be used together with taskId which identifies the task to resume.",
|
|
238
273
|
},
|
|
274
|
+
forkTaskId: {
|
|
275
|
+
type: "string",
|
|
276
|
+
description: "Fork this existing task into a new task. The source remains unchanged; taskId optionally selects the new task ID.",
|
|
277
|
+
},
|
|
278
|
+
rollback: {
|
|
279
|
+
type: "number",
|
|
280
|
+
description: "Discard this many newest agent interactions before resuming or forking. Must be a non-negative integer.",
|
|
281
|
+
},
|
|
239
282
|
parentTaskId: {
|
|
240
283
|
type: "string",
|
|
241
284
|
description: "The taskId of the parent that should be notified by this child (e.g. via replyToParent). " +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startAgentTask.js","sourceRoot":"","sources":["../../../../src/agents/tools/startAgentTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"startAgentTask.js","sourceRoot":"","sources":["../../../../src/agents/tools/startAgentTask.ts"],"names":[],"mappings":"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"}
|
package/ts_build/src/ai.js
CHANGED
|
@@ -82,13 +82,14 @@ function readPromptFile(promptFile, input) {
|
|
|
82
82
|
async function singlePrompt(userPrompt, model = "", agent = "", agentOptions) {
|
|
83
83
|
if (agent) {
|
|
84
84
|
const { startAgentTask } = await Promise.resolve().then(() => __importStar(require("./agents/tools/startAgentTask")));
|
|
85
|
-
|
|
85
|
+
const result = await startAgentTask({
|
|
86
86
|
agentName: agent,
|
|
87
87
|
prompt: userPrompt,
|
|
88
88
|
model: model || undefined,
|
|
89
89
|
waitForCompletion: true,
|
|
90
90
|
...(agentOptions ?? {}),
|
|
91
91
|
});
|
|
92
|
+
return JSON.stringify(result);
|
|
92
93
|
}
|
|
93
94
|
if (!model) {
|
|
94
95
|
model = types_1.Models.openai.GPT_54_Nano;
|
package/ts_build/src/ai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai.js","sourceRoot":"","sources":["../../src/ai.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,wCAuBC;AAED,
|
|
1
|
+
{"version":3,"file":"ai.js","sourceRoot":"","sources":["../../src/ai.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,wCAuBC;AAED,oCAkCC;AAwGD,wCAiBC;AAED,8BASC;AAED,wCAaC;AAED,sCAQC;AAgCD,oCA0BC;AAjTD,uCAAyB;AAWzB,oDAA4B;AAE5B,6CAA6C;AAC7C,qCAAyC;AACzC,uCAAoC;AACpC,2DAA+D;AAE/D,MAAM,MAAM,GAAG,IAAA,sBAAa,GAAE,CAAC;AAC/B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;AAE1C,mCAAiC;AAExB,uFAFA,cAAM,OAEA;AAER,MAAM,MAAM,GAAG,GAAG,EAAE,CACzB,IAAI,gBAAM,CAAC;IACT,MAAM,EAAE,UAAU;IAClB,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;CAC/D,CAAC,CAAC;AAJQ,QAAA,MAAM,UAId;AAEL,SAAgB,cAAc,CAAC,UAAkB,EAAE,KAAa;IAC9D,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC5D,IAAI,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAEtC,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,cAAc,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACpD,CAAC;gBAGD,OAAO,cAAc,CAAC;YACxB,CAAC;iBAAM,CAAC;gBAEN,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,GAAG,cAAc,OAAO,KAAK,EAAE,CAAC;gBACzC,CAAC;gBACD,OAAO,cAAc,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,UAAkB,EAClB,KAAK,GAAG,EAAE,EACV,KAAK,GAAG,EAAE,EACV,YAA2B;IAE3B,IAAI,KAAK,EAAE,CAAC;QAIV,MAAM,EAAE,cAAc,EAAE,GAAG,wDAAa,+BAA+B,GAAC,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;YAClC,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,KAAK,IAAI,SAAS;YACzB,iBAAiB,EAAE,IAAI;YACvB,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;SACxB,CAAC,CAAC;QAGH,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,cAAM,CAAC,MAAM,CAAC,WAAW,CAAC;IACpC,CAAC;IAGD,MAAM,IAAI,GAAG,MAAM,iBAAO,CAAC,gBAAgB,CAAC,EAAE,EAAE;QAC9C,KAAK;QACL,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;KAClD,CAAC,CAAC;IAEH,OAAO,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;AAC9C,CAAC;AAKD,SAAS,cAAc,CAAC,IAAY;IAClC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACpC,CAAC;AAKD,SAAS,oBAAoB,CAAC,GAAQ;IACpC,MAAM,GAAG,GAAW,CAAC,GAAG,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACvD,OAAO,CACL,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAC9B,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAC9B,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QAC/B,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAC9B,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;QACxB,GAAG,CAAC,QAAQ,CAAC,qBAAqB,CAAC;QACnC,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC;QAC7B,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CACjD,CAAC;AACJ,CAAC;AAYD,KAAK,UAAU,uBAAuB,CACpC,KAAe,EACf,QAAgB,EAChB,KAAa,EACb,KAAa,EACb,YAAoB,EACpB,KAAK,GAAG,CAAC,EACT,YAA2B;IAE3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAGlC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,wBAAwB,KAAK,oBAAoB,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxG,OAAO,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IAC3D,CAAC;IAGD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,eAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;IAExD,IAAI,eAAe,GAAG,YAAY,EAAE,CAAC;QAEnC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,wBAAwB,KAAK,MAAM,KAAK,CAAC,MAAM,YAAY,eAAe,0BAA0B,CAAC,CAAC;QAC3H,IAAI,CAAC;YACH,OAAO,MAAM,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;QACzE,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC;gBAAE,MAAM,GAAG,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,wBAAwB,KAAK,uDAAuD,CAAC,CAAC;QAC7G,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,wBAAwB,KAAK,MAAM,KAAK,CAAC,MAAM,YAAY,eAAe,0CAA0C,CAAC,CAAC;IAC7I,CAAC;IAKD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,wBAAwB,KAAK,mEAAmE,CAAC,CAAC;QACvH,OAAO,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IACnE,CAAC;IAGD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/B,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpD,uBAAuB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,GAAG,CAAC,EAAE,YAAY,CAAC;QAC5F,uBAAuB,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,GAAG,CAAC,EAAE,YAAY,CAAC;KAC9F,CAAC,CAAC;IAGH,MAAM,iBAAiB,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,wBAAwB,KAAK,yBAAyB,aAAa,SAAS,CAAC,CAAC;IAEnG,IAAI,aAAa,GAAG,YAAY,EAAE,CAAC;QACjC,OAAO,YAAY,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IAChE,CAAC;IAGD,OAAO,uBAAuB,CAAC,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;AAC7H,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,KAAe,EACf,QAAgB,EAChB,KAAK,GAAG,EAAE,EACV,KAAK,GAAG,EAAE,EACV,YAA2B;IAE3B,MAAM,cAAc,GAAG,KAAK,IAAI,cAAM,CAAC,MAAM,CAAC,WAAW,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAA,oCAAoB,EAAC,cAAc,CAAC,CAAC;IAE1D,OAAO,CAAC,GAAG,CACT,mBAAmB,KAAK,CAAC,MAAM,4BAA4B,YAAY,YAAY,cAAc,GAAG,KAAK,CAAC,CAAC,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACvI,CAAC;IAEF,OAAO,uBAAuB,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACzG,OAAO,4BAA4B,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,0CAA0C,GAAG,CAAC,OAAO,EAAE,CAAC;IACpI,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,SAAS,CAAC,IAAY,EAAE,SAAkB;IAC9D,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC;IAErC,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;QAChD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,KAAe,EACf,QAAgB,EAChB,KAAK,GAAG,EAAE,EACV,KAAK,GAAG,EAAE,EACV,YAA2B;IAE3B,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,SAAS,IAAI,IAAI,GAAG,CAAC,MAAM,IAAA,0BAAa,EAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;AACrE,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,IAAY,EACZ,QAAgB,EAChB,KAAK,GAAG,EAAE,EACV,KAAK,GAAG,EAAE,EACV,YAA2B;IAE3B,OAAO,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;AAC5E,CAAC;AAgCM,KAAK,UAAU,YAAY,CAChC,QAAgB,EAChB,QAAgB,EAChB,QAAQ,GAAG,QAAQ,EACnB,KAAK,GAAG,cAAM,CAAC,MAAM,CAAC,MAAM;IAE5B,MAAM,QAAQ,GAAG,MAAM,iBAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE;QACxD,KAAK;QACL,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE;oBACP,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAChC;wBACE,IAAI,EAAE,WAAW;wBACjB,SAAS,EAAE;4BACT,GAAG,EAAE,QAAQ;yBACd;qBACF;iBACF;aACF;SACF;KACF,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -43,6 +43,7 @@ exports.validateJwt = validateJwt;
|
|
|
43
43
|
const http_1 = __importDefault(require("../utils/http"));
|
|
44
44
|
const child_process_1 = require("child_process");
|
|
45
45
|
const util_1 = require("util");
|
|
46
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
46
47
|
const os = __importStar(require("os"));
|
|
47
48
|
const fs = __importStar(require("fs"));
|
|
48
49
|
const path = __importStar(require("path"));
|
|
@@ -52,6 +53,7 @@ const errors_1 = require("./errors");
|
|
|
52
53
|
class BrowserLoginService {
|
|
53
54
|
orgId;
|
|
54
55
|
baseUrl;
|
|
56
|
+
verifier = crypto_1.default.randomBytes(32).toString("hex");
|
|
55
57
|
constructor(baseUrl = KnowhowClient_1.KNOWHOW_API_URL, orgId) {
|
|
56
58
|
this.orgId = orgId;
|
|
57
59
|
if (!baseUrl) {
|
|
@@ -95,7 +97,7 @@ class BrowserLoginService {
|
|
|
95
97
|
if (status.status.toLowerCase() === "approved") {
|
|
96
98
|
spinner.stop();
|
|
97
99
|
spinner.start("Authentication successful! Retrieving token");
|
|
98
|
-
const tokenResponse = await http_1.default.post(`${this.baseUrl}/api/cli-login/session/${sessionData.sessionId}/
|
|
100
|
+
const tokenResponse = await http_1.default.post(`${this.baseUrl}/api/cli-login/session/${sessionData.sessionId}/redeem`, { verifier: this.verifier });
|
|
99
101
|
const tokenData = tokenResponse.data;
|
|
100
102
|
spinner.stop();
|
|
101
103
|
if (tokenData.requiresDeviceConfirmation) {
|
|
@@ -141,7 +143,8 @@ class BrowserLoginService {
|
|
|
141
143
|
}
|
|
142
144
|
async createSession() {
|
|
143
145
|
try {
|
|
144
|
-
const
|
|
146
|
+
const challenge = crypto_1.default.createHash("sha256").update(this.verifier, "utf8").digest("hex");
|
|
147
|
+
const response = await http_1.default.post(`${this.baseUrl}/api/cli-login/session`, { challenge }, { headers: { "User-Agent": getCliUserAgent() } });
|
|
145
148
|
return response.data;
|
|
146
149
|
}
|
|
147
150
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserLogin.js","sourceRoot":"","sources":["../../../src/auth/browserLogin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"browserLogin.js","sourceRoot":"","sources":["../../../src/auth/browserLogin.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare function hasKeyPair(privateKeyPath?: string): boolean;
|
|
2
|
+
export declare function exchangePublicKeyJwt(orgId: string, apiUrl?: string, privateKeyPath?: string): Promise<string>;
|
|
3
|
+
export declare function authenticateWithKey(orgId: string, apiUrl?: string, privateKeyPath?: string): Promise<boolean>;
|
|
4
|
+
export declare function registerPublicKey(jwt: string, publicKeyBase64: string, apiUrl?: string): Promise<void>;
|
|
5
|
+
export declare function storeJwt(jwt: string): void;
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.hasKeyPair = hasKeyPair;
|
|
7
|
+
exports.exchangePublicKeyJwt = exchangePublicKeyJwt;
|
|
8
|
+
exports.authenticateWithKey = authenticateWithKey;
|
|
9
|
+
exports.registerPublicKey = registerPublicKey;
|
|
10
|
+
exports.storeJwt = storeJwt;
|
|
11
|
+
const fs_1 = __importDefault(require("fs"));
|
|
12
|
+
const os_1 = __importDefault(require("os"));
|
|
13
|
+
const path_1 = __importDefault(require("path"));
|
|
14
|
+
const http_1 = __importDefault(require("../utils/http"));
|
|
15
|
+
const browserLogin_1 = require("./browserLogin");
|
|
16
|
+
const keyManager_1 = require("./keyManager");
|
|
17
|
+
const JWT_FILE_PATH = path_1.default.join(process.cwd(), ".knowhow", ".jwt");
|
|
18
|
+
const DEFAULT_API_URL = process.env.KNOWHOW_API_URL || "https://api.knowhow.tyvm.ai";
|
|
19
|
+
function hasKeyPair(privateKeyPath) {
|
|
20
|
+
return (0, keyManager_1.keyPairExists)(privateKeyPath);
|
|
21
|
+
}
|
|
22
|
+
async function exchangePublicKeyJwt(orgId, apiUrl = DEFAULT_API_URL, privateKeyPath) {
|
|
23
|
+
if (!(0, keyManager_1.keyPairExists)(privateKeyPath)) {
|
|
24
|
+
throw new Error("CLI identity is unavailable");
|
|
25
|
+
}
|
|
26
|
+
const keyPair = (0, keyManager_1.loadKeyPair)(privateKeyPath);
|
|
27
|
+
const headers = { "User-Agent": (0, browserLogin_1.getCliUserAgent)() };
|
|
28
|
+
const challengeResponse = await http_1.default.post(`${apiUrl}/api/public-keys/challenge`, { publicKey: keyPair.publicKeyBase64, orgId }, { headers });
|
|
29
|
+
const { challengeId, message } = challengeResponse.data;
|
|
30
|
+
if (typeof challengeId !== "string" ||
|
|
31
|
+
challengeId.length === 0 ||
|
|
32
|
+
challengeId.length > 128 ||
|
|
33
|
+
!/^[A-Za-z0-9_-]+$/.test(challengeId) ||
|
|
34
|
+
typeof message !== "string" ||
|
|
35
|
+
message.length === 0) {
|
|
36
|
+
throw new Error("Public-key challenge response is invalid");
|
|
37
|
+
}
|
|
38
|
+
const response = await http_1.default.post(`${apiUrl}/api/public-keys/authenticate`, { challengeId, signature: (0, keyManager_1.signMessage)(message, privateKeyPath) }, { headers });
|
|
39
|
+
if (!response.data.jwt) {
|
|
40
|
+
throw new Error("Public-key authentication returned no JWT");
|
|
41
|
+
}
|
|
42
|
+
return response.data.jwt;
|
|
43
|
+
}
|
|
44
|
+
async function authenticateWithKey(orgId, apiUrl = DEFAULT_API_URL, privateKeyPath) {
|
|
45
|
+
if (!(0, keyManager_1.keyPairExists)(privateKeyPath))
|
|
46
|
+
return false;
|
|
47
|
+
try {
|
|
48
|
+
storeJwt(await exchangePublicKeyJwt(orgId, apiUrl, privateKeyPath));
|
|
49
|
+
return true;
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
if (http_1.default.isHttpError(error) && (error.status === 401 || error.status === 404)) {
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
throw error;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
async function registerPublicKey(jwt, publicKeyBase64, apiUrl = DEFAULT_API_URL) {
|
|
59
|
+
const rawPublicKey = Buffer.from(publicKeyBase64, "base64");
|
|
60
|
+
if (rawPublicKey.length !== 32 || rawPublicKey.toString("base64") !== publicKeyBase64) {
|
|
61
|
+
throw new Error("CLI authentication requires a 32-byte Ed25519 public key");
|
|
62
|
+
}
|
|
63
|
+
await http_1.default.post(`${apiUrl}/api/public-keys/register`, {
|
|
64
|
+
publicKey: publicKeyBase64,
|
|
65
|
+
label: os_1.default.hostname(),
|
|
66
|
+
}, {
|
|
67
|
+
headers: {
|
|
68
|
+
Authorization: `Bearer ${jwt}`,
|
|
69
|
+
"User-Agent": (0, browserLogin_1.getCliUserAgent)(),
|
|
70
|
+
},
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
function storeJwt(jwt) {
|
|
74
|
+
const directory = path_1.default.dirname(JWT_FILE_PATH);
|
|
75
|
+
fs_1.default.mkdirSync(directory, { recursive: true });
|
|
76
|
+
fs_1.default.writeFileSync(JWT_FILE_PATH, jwt, { mode: 0o600 });
|
|
77
|
+
fs_1.default.chmodSync(JWT_FILE_PATH, 0o600);
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=keyAuth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"keyAuth.js","sourceRoot":"","sources":["../../../src/auth/keyAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export interface KeyPair {
|
|
2
|
+
privateKeyPath: string;
|
|
3
|
+
publicKeyPath: string;
|
|
4
|
+
publicKeyBase64: string;
|
|
5
|
+
fingerprint: string;
|
|
6
|
+
}
|
|
7
|
+
export declare function getKeyDir(): string;
|
|
8
|
+
export declare function getDefaultPrivateKeyPath(): string;
|
|
9
|
+
export declare function getDefaultPublicKeyPath(): string;
|
|
10
|
+
export declare function keyPairExists(privateKeyPath?: string): boolean;
|
|
11
|
+
export declare function generateKeyPair(privateKeyPath?: string): KeyPair;
|
|
12
|
+
export declare function loadKeyPair(privateKeyPath?: string): KeyPair;
|
|
13
|
+
export declare function getOrCreatePublicKey(privateKeyPath?: string): KeyPair;
|
|
14
|
+
export declare function signMessage(message: string, privateKeyPath?: string): string;
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getKeyDir = getKeyDir;
|
|
7
|
+
exports.getDefaultPrivateKeyPath = getDefaultPrivateKeyPath;
|
|
8
|
+
exports.getDefaultPublicKeyPath = getDefaultPublicKeyPath;
|
|
9
|
+
exports.keyPairExists = keyPairExists;
|
|
10
|
+
exports.generateKeyPair = generateKeyPair;
|
|
11
|
+
exports.loadKeyPair = loadKeyPair;
|
|
12
|
+
exports.getOrCreatePublicKey = getOrCreatePublicKey;
|
|
13
|
+
exports.signMessage = signMessage;
|
|
14
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
15
|
+
const fs_1 = __importDefault(require("fs"));
|
|
16
|
+
const os_1 = __importDefault(require("os"));
|
|
17
|
+
const path_1 = __importDefault(require("path"));
|
|
18
|
+
const ED25519_KEY_TYPE = "ssh-ed25519";
|
|
19
|
+
const ED25519_RAW_KEY_LENGTH = 32;
|
|
20
|
+
const ED25519_SPKI_PREFIX = Buffer.from("302a300506032b6570032100", "hex");
|
|
21
|
+
function getKeyDir() {
|
|
22
|
+
return path_1.default.join(os_1.default.homedir(), ".knowhow", "keys");
|
|
23
|
+
}
|
|
24
|
+
function getDefaultPrivateKeyPath() {
|
|
25
|
+
return path_1.default.join(getKeyDir(), "id_ed25519");
|
|
26
|
+
}
|
|
27
|
+
function getDefaultPublicKeyPath() {
|
|
28
|
+
return `${getDefaultPrivateKeyPath()}.pub`;
|
|
29
|
+
}
|
|
30
|
+
function keyPairExists(privateKeyPath) {
|
|
31
|
+
const privatePath = privateKeyPath ?? getDefaultPrivateKeyPath();
|
|
32
|
+
return fs_1.default.existsSync(privatePath) && fs_1.default.existsSync(`${privatePath}.pub`);
|
|
33
|
+
}
|
|
34
|
+
function generateKeyPair(privateKeyPath) {
|
|
35
|
+
const privatePath = privateKeyPath ?? getDefaultPrivateKeyPath();
|
|
36
|
+
const publicPath = `${privatePath}.pub`;
|
|
37
|
+
fs_1.default.mkdirSync(path_1.default.dirname(privatePath), { recursive: true, mode: 0o700 });
|
|
38
|
+
const { privateKey, publicKey } = crypto_1.default.generateKeyPairSync("ed25519", {
|
|
39
|
+
privateKeyEncoding: { type: "pkcs8", format: "pem" },
|
|
40
|
+
publicKeyEncoding: { type: "spki", format: "der" },
|
|
41
|
+
});
|
|
42
|
+
const rawPublicKey = extractRawPublicKey(publicKey);
|
|
43
|
+
if (fs_1.default.existsSync(privatePath) || fs_1.default.existsSync(publicPath)) {
|
|
44
|
+
throw new Error(`Cannot generate identity: a key file already exists at ${privatePath} or ${publicPath}`);
|
|
45
|
+
}
|
|
46
|
+
fs_1.default.writeFileSync(privatePath, privateKey, { mode: 0o600, flag: "wx" });
|
|
47
|
+
try {
|
|
48
|
+
fs_1.default.writeFileSync(publicPath, formatOpenSshPublicKey(rawPublicKey), {
|
|
49
|
+
mode: 0o644,
|
|
50
|
+
flag: "wx",
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
fs_1.default.rmSync(privatePath, { force: true });
|
|
55
|
+
throw error;
|
|
56
|
+
}
|
|
57
|
+
return keyPairMetadata(privatePath, rawPublicKey);
|
|
58
|
+
}
|
|
59
|
+
function loadKeyPair(privateKeyPath) {
|
|
60
|
+
const privatePath = privateKeyPath ?? getDefaultPrivateKeyPath();
|
|
61
|
+
const publicPath = `${privatePath}.pub`;
|
|
62
|
+
if (!fs_1.default.existsSync(privatePath))
|
|
63
|
+
throw new Error(`Private key not found at: ${privatePath}`);
|
|
64
|
+
if (!fs_1.default.existsSync(publicPath))
|
|
65
|
+
throw new Error(`Public key not found at: ${publicPath}`);
|
|
66
|
+
const privateKey = readEd25519PrivateKey(privatePath);
|
|
67
|
+
const publicKey = parsePublicKey(fs_1.default.readFileSync(publicPath, "utf8"));
|
|
68
|
+
const derivedPublicKey = extractRawPublicKey(crypto_1.default.createPublicKey(privateKey).export({ type: "spki", format: "der" }));
|
|
69
|
+
if (!crypto_1.default.timingSafeEqual(publicKey, derivedPublicKey)) {
|
|
70
|
+
throw new Error(`Public key does not match private key: ${publicPath}`);
|
|
71
|
+
}
|
|
72
|
+
return keyPairMetadata(privatePath, publicKey);
|
|
73
|
+
}
|
|
74
|
+
function getOrCreatePublicKey(privateKeyPath) {
|
|
75
|
+
return keyPairExists(privateKeyPath)
|
|
76
|
+
? loadKeyPair(privateKeyPath)
|
|
77
|
+
: generateKeyPair(privateKeyPath);
|
|
78
|
+
}
|
|
79
|
+
function signMessage(message, privateKeyPath) {
|
|
80
|
+
const privatePath = privateKeyPath ?? getDefaultPrivateKeyPath();
|
|
81
|
+
if (!fs_1.default.existsSync(privatePath))
|
|
82
|
+
throw new Error(`Private key not found at: ${privatePath}`);
|
|
83
|
+
return crypto_1.default.sign(null, Buffer.from(message, "utf8"), readEd25519PrivateKey(privatePath)).toString("base64");
|
|
84
|
+
}
|
|
85
|
+
function readEd25519PrivateKey(privatePath) {
|
|
86
|
+
let key;
|
|
87
|
+
try {
|
|
88
|
+
key = crypto_1.default.createPrivateKey(fs_1.default.readFileSync(privatePath));
|
|
89
|
+
}
|
|
90
|
+
catch {
|
|
91
|
+
throw new Error(`Identity at ${privatePath} is not a supported PEM Ed25519 private key`);
|
|
92
|
+
}
|
|
93
|
+
if (key.asymmetricKeyType !== "ed25519") {
|
|
94
|
+
throw new Error(`Identity at ${privatePath} must be an Ed25519 private key`);
|
|
95
|
+
}
|
|
96
|
+
return key;
|
|
97
|
+
}
|
|
98
|
+
function extractRawPublicKey(spkiDer) {
|
|
99
|
+
if (spkiDer.length !== ED25519_SPKI_PREFIX.length + ED25519_RAW_KEY_LENGTH ||
|
|
100
|
+
!spkiDer.subarray(0, ED25519_SPKI_PREFIX.length).equals(ED25519_SPKI_PREFIX)) {
|
|
101
|
+
throw new Error("Invalid Ed25519 public key");
|
|
102
|
+
}
|
|
103
|
+
return spkiDer.subarray(ED25519_SPKI_PREFIX.length);
|
|
104
|
+
}
|
|
105
|
+
function sshPublicKeyBlob(rawPublicKey) {
|
|
106
|
+
const type = Buffer.from(ED25519_KEY_TYPE, "ascii");
|
|
107
|
+
const typeLength = Buffer.alloc(4);
|
|
108
|
+
const keyLength = Buffer.alloc(4);
|
|
109
|
+
typeLength.writeUInt32BE(type.length);
|
|
110
|
+
keyLength.writeUInt32BE(rawPublicKey.length);
|
|
111
|
+
return Buffer.concat([typeLength, type, keyLength, rawPublicKey]);
|
|
112
|
+
}
|
|
113
|
+
function formatOpenSshPublicKey(rawPublicKey) {
|
|
114
|
+
return `${ED25519_KEY_TYPE} ${sshPublicKeyBlob(rawPublicKey).toString("base64")} knowhow-cli\n`;
|
|
115
|
+
}
|
|
116
|
+
function parsePublicKey(value) {
|
|
117
|
+
const trimmed = value.trim();
|
|
118
|
+
if (trimmed.startsWith(`${ED25519_KEY_TYPE} `)) {
|
|
119
|
+
const parts = trimmed.split(/\s+/);
|
|
120
|
+
const blob = Buffer.from(parts[1] ?? "", "base64");
|
|
121
|
+
const expected = sshPublicKeyBlob(blob.subarray(blob.length - ED25519_RAW_KEY_LENGTH));
|
|
122
|
+
if (blob.length !== expected.length || !blob.equals(expected)) {
|
|
123
|
+
throw new Error("Invalid OpenSSH Ed25519 public key");
|
|
124
|
+
}
|
|
125
|
+
return blob.subarray(blob.length - ED25519_RAW_KEY_LENGTH);
|
|
126
|
+
}
|
|
127
|
+
if (!/^[A-Za-z0-9+/]+={0,2}$/.test(trimmed)) {
|
|
128
|
+
throw new Error("Public key must be an OpenSSH Ed25519 key");
|
|
129
|
+
}
|
|
130
|
+
const raw = Buffer.from(trimmed, "base64");
|
|
131
|
+
if (raw.length !== ED25519_RAW_KEY_LENGTH || raw.toString("base64") !== trimmed) {
|
|
132
|
+
throw new Error("Ed25519 public key must contain exactly 32 bytes");
|
|
133
|
+
}
|
|
134
|
+
return raw;
|
|
135
|
+
}
|
|
136
|
+
function keyPairMetadata(privatePath, rawPublicKey) {
|
|
137
|
+
const hash = crypto_1.default.createHash("sha256").update(sshPublicKeyBlob(rawPublicKey)).digest("base64").replace(/=+$/, "");
|
|
138
|
+
return {
|
|
139
|
+
privateKeyPath: privatePath,
|
|
140
|
+
publicKeyPath: `${privatePath}.pub`,
|
|
141
|
+
publicKeyBase64: rawPublicKey.toString("base64"),
|
|
142
|
+
fingerprint: `SHA256:${hash}`,
|
|
143
|
+
};
|
|
144
|
+
}
|
|
145
|
+
//# sourceMappingURL=keyManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"keyManager.js","sourceRoot":"","sources":["../../../src/auth/keyManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { ChatService, ChatContext, ChatCommand, ChatMode, InputMethod } from "./types";
|
|
2
2
|
import { ChatModule } from "./types";
|
|
3
3
|
import { ChatInteraction } from "../types";
|
|
4
|
+
import { ModuleExtension } from "../services/ExtensionsService";
|
|
5
|
+
export interface ChatExtension extends ModuleExtension {
|
|
6
|
+
type: "chat";
|
|
7
|
+
commands: ChatCommand[];
|
|
8
|
+
}
|
|
4
9
|
export declare class CliChatService implements ChatService {
|
|
5
10
|
private context;
|
|
6
11
|
private commands;
|
|
@@ -23,6 +28,7 @@ export declare class CliChatService implements ChatService {
|
|
|
23
28
|
registerMode(mode: ChatMode): void;
|
|
24
29
|
registerModule(module: ChatModule): void;
|
|
25
30
|
getCommands(): ChatCommand[];
|
|
31
|
+
refreshExtensions(): void;
|
|
26
32
|
getCommandsForMode(mode: string): ChatCommand[];
|
|
27
33
|
getCommandsForActiveModes(): ChatCommand[];
|
|
28
34
|
setMode(mode: string): void;
|