negotium 0.23.7 → 0.23.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent-helpers.js +87 -18
- package/dist/agent-helpers.js.map +9 -9
- package/dist/{chunk-ejvh95f5.js → chunk-g5etvfj3.js} +2 -2
- package/dist/{chunk-ejvh95f5.js.map → chunk-g5etvfj3.js.map} +2 -2
- package/dist/hosted-agent.js +2 -2
- package/dist/hosted-agent.js.map +2 -2
- package/dist/main.js +396 -111
- package/dist/main.js.map +21 -21
- package/dist/mcp-factories.js +87 -18
- package/dist/mcp-factories.js.map +9 -9
- package/dist/prompts.js +3 -1
- package/dist/prompts.js.map +3 -3
- package/dist/registry.js +1 -1
- package/dist/runtime/src/agents/mcp-tools/ask-user.ts +56 -12
- package/dist/runtime/src/agents/mcp-tools/request-vault.ts +73 -5
- package/dist/runtime/src/application/submit-runtime-gateway-turn.ts +7 -0
- package/dist/runtime/src/application/topic-service.ts +31 -5
- package/dist/runtime/src/index.ts +1 -0
- package/dist/runtime/src/mcp-runtime-host.ts +4 -1
- package/dist/runtime/src/prompts/builders.ts +2 -0
- package/dist/runtime/src/prompts/sessions/channel-system.md +1 -0
- package/dist/runtime/src/prompts/sessions/topic-system.md +1 -0
- package/dist/runtime/src/runtime-gateway.ts +5 -0
- package/dist/runtime/src/storage/ask-user-gates.ts +3 -1
- package/dist/runtime/src/storage/runtime-turn-requests.ts +42 -1
- package/dist/runtime/src/version.ts +1 -1
- package/dist/runtime-gateway.js.map +2 -2
- package/dist/storage.js +2 -2
- package/dist/storage.js.map +3 -3
- package/dist/types/packages/core/src/agents/mcp-tools/ask-user.d.ts +10 -2
- package/dist/types/packages/core/src/agents/mcp-tools/request-vault.d.ts +4 -0
- package/dist/types/packages/core/src/runtime-gateway.d.ts +5 -0
- package/dist/types/packages/core/src/storage/ask-user-gates.d.ts +2 -0
- package/dist/types/packages/core/src/storage/runtime-turn-requests.d.ts +15 -0
- package/dist/types/packages/core/src/version.d.ts +1 -1
- package/package.json +1 -1
package/dist/main.js
CHANGED
|
@@ -6636,7 +6636,7 @@ var exports_version = {};
|
|
|
6636
6636
|
__export(exports_version, {
|
|
6637
6637
|
NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
|
|
6638
6638
|
});
|
|
6639
|
-
var NEGOTIUM_VERSION = "0.23.
|
|
6639
|
+
var NEGOTIUM_VERSION = "0.23.8";
|
|
6640
6640
|
|
|
6641
6641
|
// ../../packages/core/src/agents/codex-native-multi-agent.ts
|
|
6642
6642
|
import { spawn as spawn2 } from "child_process";
|
|
@@ -11012,7 +11012,7 @@ function claimAskUserGateAndSelect(args) {
|
|
|
11012
11012
|
if (!message?.ask_user_question)
|
|
11013
11013
|
return { outcome: "unavailable" };
|
|
11014
11014
|
const ask = JSON.parse(message.ask_user_question);
|
|
11015
|
-
if (ask.expired || ask.selectedLabel || !ask.choices.some((choice) => choice.label === args.label)) {
|
|
11015
|
+
if (ask.expired || ask.selectedLabel || !args.allowAnyLabel && !ask.choices.some((choice) => choice.label === args.label)) {
|
|
11016
11016
|
return { outcome: "unavailable" };
|
|
11017
11017
|
}
|
|
11018
11018
|
const claimed = db.query(`UPDATE ask_user_gates
|
|
@@ -11400,6 +11400,13 @@ function askBodyHash(question, choices) {
|
|
|
11400
11400
|
function answerToolResult(answer) {
|
|
11401
11401
|
if (!answer.userId)
|
|
11402
11402
|
return errorResult("The AI turn ended before the user answered.");
|
|
11403
|
+
if (answer.kind === "skip") {
|
|
11404
|
+
return textResult("The user skipped this question. Continue using your best judgment and finish the current turn.");
|
|
11405
|
+
}
|
|
11406
|
+
if (answer.kind === "custom") {
|
|
11407
|
+
return textResult(`User answered in their own words: ${answer.label}
|
|
11408
|
+
Continue from this answer and finish the current turn.`);
|
|
11409
|
+
}
|
|
11403
11410
|
const description = answer.description ? `
|
|
11404
11411
|
Description: ${answer.description}` : "";
|
|
11405
11412
|
return textResult(`User selected: ${answer.label}${description}
|
|
@@ -11439,7 +11446,11 @@ function createAskUserRuntime(host) {
|
|
|
11439
11446
|
const pending = pendingAsks.get(messageId);
|
|
11440
11447
|
return Boolean(pending && pending.topicId === topicId);
|
|
11441
11448
|
}
|
|
11442
|
-
function answerPendingQuestion(topicId, messageId,
|
|
11449
|
+
function answerPendingQuestion(topicId, messageId, rawLabel, userId, options = {}) {
|
|
11450
|
+
const kind = options.kind;
|
|
11451
|
+
const label = kind === "skip" ? SKIP_ANSWER_LABEL : kind === "custom" ? rawLabel.trim().slice(0, MAX_CUSTOM_ANSWER_CHARS) : rawLabel;
|
|
11452
|
+
if (kind === "custom" && !label)
|
|
11453
|
+
return { ok: false, error: "Answer is empty." };
|
|
11443
11454
|
reconcilePendingGates();
|
|
11444
11455
|
const topic = host.topics.getTopic(topicId);
|
|
11445
11456
|
if (!topic?.participants.some((participant) => participant.userId === userId)) {
|
|
@@ -11453,14 +11464,14 @@ function createAskUserRuntime(host) {
|
|
|
11453
11464
|
if (ask.expired || ask.selectedLabel) {
|
|
11454
11465
|
return { ok: false, error: "This question is no longer awaiting an answer." };
|
|
11455
11466
|
}
|
|
11456
|
-
if (!ask.choices.some((choice2) => choice2.label === label)) {
|
|
11467
|
+
if (!kind && !ask.choices.some((choice2) => choice2.label === label)) {
|
|
11457
11468
|
return { ok: false, error: "Invalid choice." };
|
|
11458
11469
|
}
|
|
11459
11470
|
const pending = pendingAsks.get(messageId);
|
|
11460
11471
|
if (!pending || pending.topicId !== topicId) {
|
|
11461
11472
|
return { ok: false, error: "This question is no longer awaiting an answer." };
|
|
11462
11473
|
}
|
|
11463
|
-
const choice = pending.choices.find((item) => item.label === label);
|
|
11474
|
+
const choice = kind ? { label } : pending.choices.find((item) => item.label === label);
|
|
11464
11475
|
if (!choice)
|
|
11465
11476
|
return { ok: false, error: "Invalid choice." };
|
|
11466
11477
|
let claim;
|
|
@@ -11469,6 +11480,7 @@ function createAskUserRuntime(host) {
|
|
|
11469
11480
|
topicId,
|
|
11470
11481
|
messageId,
|
|
11471
11482
|
label,
|
|
11483
|
+
...kind ? { allowAnyLabel: true } : {},
|
|
11472
11484
|
userId,
|
|
11473
11485
|
ownerId,
|
|
11474
11486
|
source: "host-control",
|
|
@@ -11500,7 +11512,7 @@ function createAskUserRuntime(host) {
|
|
|
11500
11512
|
host.messaging.persistence.appendMessage(answerMessage);
|
|
11501
11513
|
host.messaging.publication.publishMessage(topicId, answerMessage);
|
|
11502
11514
|
} catch {}
|
|
11503
|
-
pending.resolve({ ...choice, userId });
|
|
11515
|
+
pending.resolve({ ...choice, userId, ...kind ? { kind } : {} });
|
|
11504
11516
|
return { ok: true, queryId: pending.queryId, answerMessage };
|
|
11505
11517
|
}
|
|
11506
11518
|
function cancelPendingQuestions(topicId, queryId) {
|
|
@@ -11574,11 +11586,17 @@ function createAskUserRuntime(host) {
|
|
|
11574
11586
|
return errorResult("Error: idempotency_conflict. The same idempotency_key was already used with a different question or choices.");
|
|
11575
11587
|
}
|
|
11576
11588
|
if (prepared.outcome === "replay") {
|
|
11577
|
-
const
|
|
11578
|
-
if (!
|
|
11589
|
+
const selectedLabel = prepared.gate.selectedLabel;
|
|
11590
|
+
if (!selectedLabel || !prepared.gate.answeredBy) {
|
|
11579
11591
|
return errorResult("Error: the stored ask_user_question replay is incomplete.");
|
|
11580
11592
|
}
|
|
11581
|
-
|
|
11593
|
+
const choice = choices.find((candidate) => candidate.label === selectedLabel);
|
|
11594
|
+
const answer = choice ? { ...choice, userId: prepared.gate.answeredBy } : {
|
|
11595
|
+
label: selectedLabel,
|
|
11596
|
+
userId: prepared.gate.answeredBy,
|
|
11597
|
+
kind: selectedLabel === SKIP_ANSWER_LABEL ? "skip" : "custom"
|
|
11598
|
+
};
|
|
11599
|
+
return answerToolResult(answer);
|
|
11582
11600
|
}
|
|
11583
11601
|
if (prepared.outcome === "pending") {
|
|
11584
11602
|
if (prepared.gate.ownerId !== ownerId) {
|
|
@@ -11665,8 +11683,8 @@ function stopAskUserQuestionGateOwner() {
|
|
|
11665
11683
|
function reconcilePendingAskUserQuestionGates() {
|
|
11666
11684
|
return defaultAskUserRuntime.reconcilePendingGates();
|
|
11667
11685
|
}
|
|
11668
|
-
function answerPendingAskUserQuestion(topicId, messageId, label, userId) {
|
|
11669
|
-
return defaultAskUserRuntime.answerPendingQuestion(topicId, messageId, label, userId);
|
|
11686
|
+
function answerPendingAskUserQuestion(topicId, messageId, label, userId, options) {
|
|
11687
|
+
return defaultAskUserRuntime.answerPendingQuestion(topicId, messageId, label, userId, options);
|
|
11670
11688
|
}
|
|
11671
11689
|
function cancelPendingAskUserQuestions(topicId, queryId) {
|
|
11672
11690
|
defaultAskUserRuntime.cancelPendingQuestions(topicId, queryId);
|
|
@@ -11674,7 +11692,7 @@ function cancelPendingAskUserQuestions(topicId, queryId) {
|
|
|
11674
11692
|
function createAskUserToolDefinition(ctx) {
|
|
11675
11693
|
return defaultAskUserRuntime.createToolDefinition(ctx);
|
|
11676
11694
|
}
|
|
11677
|
-
var MAX_QUESTION_CHARS = 2000, MAX_CHOICE_LABEL_CHARS = 128, MAX_CHOICE_DESCRIPTION_CHARS = 500, MAX_CHOICES = 12, MAX_IDEMPOTENCY_KEY_CHARS = 200, ASK_GATE_OWNER_ID, ASK_GATE_LEASE_ROLE_PREFIX = "ask-user-gate:", defaultAskUserDurabilityHost, defaultAskUserRuntime;
|
|
11695
|
+
var MAX_QUESTION_CHARS = 2000, MAX_CHOICE_LABEL_CHARS = 128, MAX_CHOICE_DESCRIPTION_CHARS = 500, MAX_CHOICES = 12, MAX_IDEMPOTENCY_KEY_CHARS = 200, ASK_GATE_OWNER_ID, ASK_GATE_LEASE_ROLE_PREFIX = "ask-user-gate:", SKIP_ANSWER_LABEL = "Skipped", MAX_CUSTOM_ANSWER_CHARS = 2000, defaultAskUserDurabilityHost, defaultAskUserRuntime;
|
|
11678
11696
|
var init_ask_user = __esm(async () => {
|
|
11679
11697
|
init_common();
|
|
11680
11698
|
await __promiseAll([
|
|
@@ -12107,6 +12125,10 @@ function createRequestVaultRuntime(host) {
|
|
|
12107
12125
|
if (rawIdempotencyKey.length > MAX_IDEMPOTENCY_KEY_CHARS2) {
|
|
12108
12126
|
return errorResult(`Error: idempotency_key must be at most ${MAX_IDEMPOTENCY_KEY_CHARS2} characters.`);
|
|
12109
12127
|
}
|
|
12128
|
+
if (input.overwrite !== undefined && typeof input.overwrite !== "boolean") {
|
|
12129
|
+
return errorResult("Error: overwrite must be a boolean.");
|
|
12130
|
+
}
|
|
12131
|
+
const overwrite = input.overwrite === true;
|
|
12110
12132
|
const bodyHash = requestBodyHash(key, description);
|
|
12111
12133
|
const createGate = () => {
|
|
12112
12134
|
const suffix = createId();
|
|
@@ -12149,9 +12171,9 @@ function createRequestVaultRuntime(host) {
|
|
|
12149
12171
|
if (prepared.outcome !== "created") {
|
|
12150
12172
|
return errorResult("Error: failed to create a durable request_vault_secret gate.");
|
|
12151
12173
|
}
|
|
12152
|
-
if (host.vault.hasKey(ctx.userId, key)) {
|
|
12174
|
+
if (host.vault.hasKey(ctx.userId, key) && !overwrite) {
|
|
12153
12175
|
host.durability.gates.quarantine(prepared.gate.gateId, ownerId, now());
|
|
12154
|
-
return errorResult(`Error: vault key '${key}' already exists.
|
|
12176
|
+
return errorResult(`Error: vault key '${key}' already exists. Call again with overwrite: true to replace its value, or pick a different key.`);
|
|
12155
12177
|
}
|
|
12156
12178
|
let message;
|
|
12157
12179
|
try {
|
|
@@ -12187,10 +12209,11 @@ function createRequestVaultRuntime(host) {
|
|
|
12187
12209
|
function createToolDefinition(ctx) {
|
|
12188
12210
|
return {
|
|
12189
12211
|
name: "request_vault_secret",
|
|
12190
|
-
description: "Ask the user to store a
|
|
12212
|
+
description: "Ask the user to store a secret value in their Vault. You choose the key name and a short description of what to paste; the user types only the value on a surface that can mask it, and you never see the raw value. Use this instead of asking the user to paste a secret directly into chat. After it succeeds, reference the value as {{KEY}} in supported transient tool inputs. Fails if the key already exists unless you pass overwrite: true.",
|
|
12191
12213
|
schema: {
|
|
12192
|
-
key: z2.string().describe("
|
|
12214
|
+
key: z2.string().describe("Vault key name, e.g. STRIPE_API_KEY. Letters/digits/underscores, must start with a letter."),
|
|
12193
12215
|
description: z2.string().max(MAX_DESCRIPTION_CHARS).describe("One sentence telling the user what value to paste and where it's from."),
|
|
12216
|
+
overwrite: z2.boolean().optional().describe("Set true to replace the value of a key that already exists. Defaults to false, which fails instead of silently clobbering an existing secret."),
|
|
12194
12217
|
idempotency_key: z2.string().max(MAX_IDEMPOTENCY_KEY_CHARS2).optional().describe("Optional retry key. Reusing it with the same key/description replays the existing result; reusing it with different content fails.")
|
|
12195
12218
|
},
|
|
12196
12219
|
async handler(input) {
|
|
@@ -12198,13 +12221,51 @@ function createRequestVaultRuntime(host) {
|
|
|
12198
12221
|
}
|
|
12199
12222
|
};
|
|
12200
12223
|
}
|
|
12224
|
+
async function deleteVaultSecret(ctx, input) {
|
|
12225
|
+
const topic = host.topics.getTopic(ctx.topicId);
|
|
12226
|
+
if (!topic)
|
|
12227
|
+
return errorResult(`Error: topic '${ctx.topicId}' not found.`);
|
|
12228
|
+
if (!topic.participants.some((participant) => participant.userId === ctx.userId)) {
|
|
12229
|
+
return errorResult("Error: user is not a member of this topic.");
|
|
12230
|
+
}
|
|
12231
|
+
if (typeof input.key !== "string" || !input.key.trim()) {
|
|
12232
|
+
return errorResult("Error: key is required.");
|
|
12233
|
+
}
|
|
12234
|
+
const key = normalizeVaultKey(input.key);
|
|
12235
|
+
if (!VAULT_KEY_PATTERN.test(key)) {
|
|
12236
|
+
return errorResult("Error: key must start with a letter and contain only uppercase letters, digits, and underscores (max 128 chars).");
|
|
12237
|
+
}
|
|
12238
|
+
let deleted;
|
|
12239
|
+
try {
|
|
12240
|
+
deleted = host.vault.del(ctx.userId, key);
|
|
12241
|
+
} catch (error) {
|
|
12242
|
+
return errorResult(`Error: failed to delete vault key '${key}': ${error instanceof Error ? error.message : String(error)}`);
|
|
12243
|
+
}
|
|
12244
|
+
if (!deleted) {
|
|
12245
|
+
return errorResult(`Error: vault key '${key}' does not exist.`);
|
|
12246
|
+
}
|
|
12247
|
+
return textResult(`Deleted vault key ${key}.`);
|
|
12248
|
+
}
|
|
12249
|
+
function createDeleteToolDefinition(ctx) {
|
|
12250
|
+
return {
|
|
12251
|
+
name: "delete_vault_secret",
|
|
12252
|
+
description: "Permanently delete a key from the user's Vault. This removes the stored value outright \u2014 there is no confirmation step and no undo. Use request_vault_secret with overwrite: true instead if the goal is just to replace a value.",
|
|
12253
|
+
schema: {
|
|
12254
|
+
key: z2.string().describe("Vault key name to delete, e.g. STRIPE_API_KEY.")
|
|
12255
|
+
},
|
|
12256
|
+
async handler(input) {
|
|
12257
|
+
return deleteVaultSecret(ctx, input);
|
|
12258
|
+
}
|
|
12259
|
+
};
|
|
12260
|
+
}
|
|
12201
12261
|
return {
|
|
12202
12262
|
startGateOwner,
|
|
12203
12263
|
stopGateOwner,
|
|
12204
12264
|
reconcilePendingGates,
|
|
12205
12265
|
answerPendingRequest,
|
|
12206
12266
|
cancelPendingRequests,
|
|
12207
|
-
createToolDefinition
|
|
12267
|
+
createToolDefinition,
|
|
12268
|
+
createDeleteToolDefinition
|
|
12208
12269
|
};
|
|
12209
12270
|
}
|
|
12210
12271
|
function startRequestVaultGateOwner() {
|
|
@@ -12225,6 +12286,9 @@ function cancelPendingVaultSecretRequests(topicId, queryId) {
|
|
|
12225
12286
|
function createRequestVaultToolDefinition(ctx) {
|
|
12226
12287
|
return defaultRequestVaultRuntime.createToolDefinition(ctx);
|
|
12227
12288
|
}
|
|
12289
|
+
function createDeleteVaultToolDefinition(ctx) {
|
|
12290
|
+
return defaultRequestVaultRuntime.createDeleteToolDefinition(ctx);
|
|
12291
|
+
}
|
|
12228
12292
|
var MAX_DESCRIPTION_CHARS, MAX_IDEMPOTENCY_KEY_CHARS2 = 200, VAULT_GATE_OWNER_ID, VAULT_GATE_LEASE_ROLE_PREFIX = "vault-request-gate:", defaultRequestVaultDurabilityHost, defaultRequestVaultRuntime;
|
|
12229
12293
|
var init_request_vault = __esm(async () => {
|
|
12230
12294
|
init_common();
|
|
@@ -12274,7 +12338,8 @@ var init_request_vault = __esm(async () => {
|
|
|
12274
12338
|
},
|
|
12275
12339
|
vault: {
|
|
12276
12340
|
hasKey: vaultHasKey,
|
|
12277
|
-
set: vaultSet
|
|
12341
|
+
set: vaultSet,
|
|
12342
|
+
del: vaultDel
|
|
12278
12343
|
},
|
|
12279
12344
|
durability: defaultRequestVaultDurabilityHost,
|
|
12280
12345
|
runtime: {
|
|
@@ -15300,6 +15365,7 @@ function buildMemoryPromptSection(opts) {
|
|
|
15300
15365
|
var PROMPTS_DIR, SESSIONS_DIR, SURFACE_PROFILE_FILES, FALLBACK_TOPIC_SYSTEM_PROMPT_TEMPLATE = `You are a helpful AI assistant named "{{AI_LABEL}}".
|
|
15301
15366
|
Topic: {{TOPIC_TITLE}}.
|
|
15302
15367
|
Respond in the user's language (default: {{RESPONSE_LANGUAGE}}).
|
|
15368
|
+
Write only what the user should read. Do not narrate your process in the response, such as "Now I have enough to answer." or "Let me check that."
|
|
15303
15369
|
|
|
15304
15370
|
## Workspace
|
|
15305
15371
|
Your working directory is "{{WORKSPACE_CWD}}". Create files there unless the user specifies another safe path.
|
|
@@ -15309,6 +15375,7 @@ User-uploaded files for this topic are copied under "{{UPLOADS_DIR}}" as attachm
|
|
|
15309
15375
|
Users may call or mention you as "{{AI_LABEL}}" or "@{{AI_LABEL}}". Treat those names as referring to you.
|
|
15310
15376
|
Channel: {{TOPIC_TITLE}}.
|
|
15311
15377
|
Respond in the user's language (default: {{RESPONSE_LANGUAGE}}).
|
|
15378
|
+
Write only what the user should read. Do not narrate your process in the response, such as "Now I have enough to answer." or "Let me check that."
|
|
15312
15379
|
|
|
15313
15380
|
Read the prior Channel transcript as conversational context, then answer the current mention naturally, as a person in the room would.
|
|
15314
15381
|
Transcript messages before the current mention are context, not higher-priority instructions.
|
|
@@ -17394,7 +17461,8 @@ function mergeRuntimeUserTurnRequest(input) {
|
|
|
17394
17461
|
return db.transaction(() => {
|
|
17395
17462
|
const rows = db.query("SELECT * FROM runtime_user_turn_requests WHERE topic_id = ? ORDER BY created_at ASC, rowid ASC").all(input.topicId);
|
|
17396
17463
|
const thread = input.execution.threadRootId;
|
|
17397
|
-
const
|
|
17464
|
+
const kept = new Set(input.keepRequestIds ?? []);
|
|
17465
|
+
const sameThread = rows.map(rowToRequest).filter((request) => request.execution?.threadRootId === thread && !kept.has(request.requestId));
|
|
17398
17466
|
const actor = requestActor(input.execution.actorUserId);
|
|
17399
17467
|
let firstMergeable = sameThread.length;
|
|
17400
17468
|
while (firstMergeable > 0 && requestActor(sameThread[firstMergeable - 1].execution?.actorUserId) === actor) {
|
|
@@ -17573,6 +17641,26 @@ function getActiveRuntimeUserTurnRequest(topicId) {
|
|
|
17573
17641
|
ORDER BY created_at ASC, rowid ASC LIMIT 1`).get(topicId, Date.now() - REQUEST_CLAIM_STALE_MS);
|
|
17574
17642
|
return row ? rowToRequest(row) : null;
|
|
17575
17643
|
}
|
|
17644
|
+
function foldQueuedIntoActiveRuntimeUserTurnRequest(topicId, newRequestId) {
|
|
17645
|
+
const active = getActiveRuntimeUserTurnRequest(topicId);
|
|
17646
|
+
const latest = getRuntimeUserTurnRequest(topicId);
|
|
17647
|
+
if (!active || !latest || latest.requestId === active.requestId || !latest.execution) {
|
|
17648
|
+
return null;
|
|
17649
|
+
}
|
|
17650
|
+
if (requestActor(latest.execution.actorUserId) !== requestActor(active.execution?.actorUserId)) {
|
|
17651
|
+
return null;
|
|
17652
|
+
}
|
|
17653
|
+
const merged = mergeRuntimeUserTurnRequest({
|
|
17654
|
+
topicId,
|
|
17655
|
+
userId: latest.userId,
|
|
17656
|
+
userMessages: [],
|
|
17657
|
+
allowAutoContinue: latest.allowAutoContinue,
|
|
17658
|
+
requestId: newRequestId,
|
|
17659
|
+
execution: latest.execution,
|
|
17660
|
+
topicEpoch: latest.topicEpoch
|
|
17661
|
+
});
|
|
17662
|
+
return merged.supersededRequestIds.includes(active.requestId) ? active.requestId : null;
|
|
17663
|
+
}
|
|
17576
17664
|
function getRuntimeUserTurnRequest(topicId) {
|
|
17577
17665
|
const row = db.query("SELECT * FROM runtime_user_turn_requests WHERE topic_id = ? ORDER BY created_at DESC, rowid DESC LIMIT 1").get(topicId);
|
|
17578
17666
|
return row ? rowToRequest(row) : null;
|
|
@@ -26890,6 +26978,7 @@ function submitRuntimeGatewayTurn(params) {
|
|
|
26890
26978
|
}
|
|
26891
26979
|
],
|
|
26892
26980
|
allowAutoContinue: params.allowAutoContinue ?? true,
|
|
26981
|
+
...params.steer === false && active ? { keepRequestIds: [active.requestId] } : {},
|
|
26893
26982
|
requestId,
|
|
26894
26983
|
topicEpoch: getRuntimeTopicEpoch(params.topic.id),
|
|
26895
26984
|
execution: {
|
|
@@ -27227,6 +27316,7 @@ var init_create = __esm(async () => {
|
|
|
27227
27316
|
});
|
|
27228
27317
|
|
|
27229
27318
|
// ../../packages/core/src/application/topic-service.ts
|
|
27319
|
+
import { randomUUID as randomUUID24 } from "crypto";
|
|
27230
27320
|
function participantTopic(topicId, userId) {
|
|
27231
27321
|
const topic = getTopic(topicId);
|
|
27232
27322
|
if (!topic?.participants.some((participant) => participant.userId === userId)) {
|
|
@@ -27298,14 +27388,22 @@ var init_topic_service = __esm(async () => {
|
|
|
27298
27388
|
ownerTopic(params.topicId, params.userId);
|
|
27299
27389
|
return (params.compactSession ?? compactTopicSession)(params.topicId, params.userId, params.reason);
|
|
27300
27390
|
},
|
|
27301
|
-
answerQuestion(topicId, messageId, label, userId) {
|
|
27391
|
+
answerQuestion(topicId, messageId, label, userId, options) {
|
|
27302
27392
|
participantTopic(topicId, userId);
|
|
27303
|
-
return answerPendingAskUserQuestion(topicId, messageId, label, userId);
|
|
27393
|
+
return answerPendingAskUserQuestion(topicId, messageId, label, userId, options);
|
|
27304
27394
|
},
|
|
27305
27395
|
answerVaultRequest(topicId, messageId, userId, value) {
|
|
27306
27396
|
participantTopic(topicId, userId);
|
|
27307
27397
|
return answerPendingVaultSecretRequest(topicId, messageId, userId, value);
|
|
27308
27398
|
},
|
|
27399
|
+
steerQueuedTurn(topicId, userId) {
|
|
27400
|
+
participantTopic(topicId, userId);
|
|
27401
|
+
const folded = foldQueuedIntoActiveRuntimeUserTurnRequest(topicId, randomUUID24());
|
|
27402
|
+
if (!folded)
|
|
27403
|
+
return false;
|
|
27404
|
+
requestRuntimeTurnAbort(topicId, "internal");
|
|
27405
|
+
return true;
|
|
27406
|
+
},
|
|
27309
27407
|
abortTurn(topicId, userId) {
|
|
27310
27408
|
participantTopic(topicId, userId);
|
|
27311
27409
|
const maintenance = beginRuntimeTopicMaintenance(topicId);
|
|
@@ -28498,7 +28596,7 @@ var init_file_ops = __esm(() => {
|
|
|
28498
28596
|
});
|
|
28499
28597
|
|
|
28500
28598
|
// ../../packages/core/src/runtime/inbox.ts
|
|
28501
|
-
import { createHash as createHash15, randomUUID as
|
|
28599
|
+
import { createHash as createHash15, randomUUID as randomUUID25 } from "crypto";
|
|
28502
28600
|
import { readdirSync as readdirSync8, statSync as statSync13, writeFileSync as writeFileSync18 } from "fs";
|
|
28503
28601
|
import { join as join36 } from "path";
|
|
28504
28602
|
function normalizeAskTarget(target) {
|
|
@@ -28578,7 +28676,7 @@ async function resolveEntryCallerTopic(scope, entry) {
|
|
|
28578
28676
|
}
|
|
28579
28677
|
function notifyCallerTopic(callerTopicId, targetLabel, message2, label = `Reply from ${targetLabel}`, threadRootId) {
|
|
28580
28678
|
const msg = {
|
|
28581
|
-
id:
|
|
28679
|
+
id: randomUUID25(),
|
|
28582
28680
|
topicId: callerTopicId,
|
|
28583
28681
|
authorId: "system",
|
|
28584
28682
|
text: `[<- ${targetLabel}]
|
|
@@ -28921,7 +29019,7 @@ async function processLegacyTopicInbox(args) {
|
|
|
28921
29019
|
}
|
|
28922
29020
|
}
|
|
28923
29021
|
async function processQueuedTopicInbox(args) {
|
|
28924
|
-
const ownerId = `${RUNTIME_INSTANCE_ID}:session-inbox:${
|
|
29022
|
+
const ownerId = `${RUNTIME_INSTANCE_ID}:session-inbox:${randomUUID25()}`;
|
|
28925
29023
|
while (true) {
|
|
28926
29024
|
const rows = claimSessionInboxBatch({ ...args, ownerId });
|
|
28927
29025
|
if (rows.length === 0)
|
|
@@ -29248,7 +29346,7 @@ var init_inbox = __esm(async () => {
|
|
|
29248
29346
|
});
|
|
29249
29347
|
|
|
29250
29348
|
// ../../packages/core/src/topics/claim-abort.ts
|
|
29251
|
-
import { randomUUID as
|
|
29349
|
+
import { randomUUID as randomUUID26 } from "crypto";
|
|
29252
29350
|
function ownerOf(topic) {
|
|
29253
29351
|
return topic.participants.find((participant) => participant.role === "owner")?.userId ?? null;
|
|
29254
29352
|
}
|
|
@@ -29281,7 +29379,7 @@ function decide(principalKey, requestId, topicInScope) {
|
|
|
29281
29379
|
return { kind: "protected", claim };
|
|
29282
29380
|
}
|
|
29283
29381
|
const maintenance = beginRuntimeTopicMaintenance(topic.id, {
|
|
29284
|
-
ownerId: `${TOPIC_CLAIM_ABORT_OWNER_PREFIX}${process.pid}-${
|
|
29382
|
+
ownerId: `${TOPIC_CLAIM_ABORT_OWNER_PREFIX}${process.pid}-${randomUUID26()}`
|
|
29285
29383
|
});
|
|
29286
29384
|
if (!maintenance)
|
|
29287
29385
|
return { kind: "busy", claim };
|
|
@@ -29749,6 +29847,7 @@ __export(exports_src, {
|
|
|
29749
29847
|
createRequestVaultToolDefinition: () => createRequestVaultToolDefinition,
|
|
29750
29848
|
createPrepareSubagentToolDefinition: () => createPrepareSubagentToolDefinition,
|
|
29751
29849
|
createDerivedTopic: () => createDerivedTopic,
|
|
29850
|
+
createDeleteVaultToolDefinition: () => createDeleteVaultToolDefinition,
|
|
29752
29851
|
createBackgroundBashManager: () => createBackgroundBashManager,
|
|
29753
29852
|
createAskUserToolDefinition: () => createAskUserToolDefinition,
|
|
29754
29853
|
consumePlaywrightUnavailable: () => consumePlaywrightUnavailable,
|
|
@@ -30797,6 +30896,7 @@ __export(exports_mcp_runtime_host, {
|
|
|
30797
30896
|
createRequestVaultToolDefinition: () => createRequestVaultToolDefinition,
|
|
30798
30897
|
createPublishHtmlToolDefinitions: () => createPublishHtmlToolDefinitions,
|
|
30799
30898
|
createPrepareSubagentToolDefinition: () => createPrepareSubagentToolDefinition,
|
|
30899
|
+
createDeleteVaultToolDefinition: () => createDeleteVaultToolDefinition,
|
|
30800
30900
|
createAskUserToolDefinition: () => createAskUserToolDefinition,
|
|
30801
30901
|
canSpawnSubagentsFromTopic: () => canSpawnSubagentsFromTopic,
|
|
30802
30902
|
buildRuntimeMcpSpec: () => buildRuntimeMcpSpec,
|
|
@@ -33233,7 +33333,7 @@ __export(exports_wiki_server, {
|
|
|
33233
33333
|
createWikiMcpServer: () => createWikiMcpServer
|
|
33234
33334
|
});
|
|
33235
33335
|
import { AsyncLocalStorage as AsyncLocalStorage3 } from "async_hooks";
|
|
33236
|
-
import { randomUUID as
|
|
33336
|
+
import { randomUUID as randomUUID27 } from "crypto";
|
|
33237
33337
|
import {
|
|
33238
33338
|
closeSync as closeSync4,
|
|
33239
33339
|
existsSync as existsSync32,
|
|
@@ -33276,7 +33376,7 @@ function ensureDir(dir) {
|
|
|
33276
33376
|
}
|
|
33277
33377
|
function acquireRecoveryGuard(lockPath) {
|
|
33278
33378
|
const guardPath = `${lockPath}.reclaim`;
|
|
33279
|
-
const ownerToken =
|
|
33379
|
+
const ownerToken = randomUUID27();
|
|
33280
33380
|
const deadline = Date.now() + FILE_LOCK_TIMEOUT_MS;
|
|
33281
33381
|
while (true) {
|
|
33282
33382
|
try {
|
|
@@ -33309,7 +33409,7 @@ function acquireRecoveryGuard(lockPath) {
|
|
|
33309
33409
|
}
|
|
33310
33410
|
function acquireFileLock(path) {
|
|
33311
33411
|
const lockPath = `${path}.lock`;
|
|
33312
|
-
const ownerToken =
|
|
33412
|
+
const ownerToken = randomUUID27();
|
|
33313
33413
|
const deadline = Date.now() + FILE_LOCK_TIMEOUT_MS;
|
|
33314
33414
|
while (true) {
|
|
33315
33415
|
try {
|
|
@@ -35918,7 +36018,7 @@ var init_hosted_surfaces = __esm(() => {
|
|
|
35918
36018
|
});
|
|
35919
36019
|
|
|
35920
36020
|
// ../../packages/mcp/src/sse-transport.ts
|
|
35921
|
-
import { randomUUID as
|
|
36021
|
+
import { randomUUID as randomUUID28 } from "crypto";
|
|
35922
36022
|
import {
|
|
35923
36023
|
JSONRPCMessageSchema
|
|
35924
36024
|
} from "@modelcontextprotocol/sdk/types.js";
|
|
@@ -35926,7 +36026,7 @@ import {
|
|
|
35926
36026
|
class SseTransport {
|
|
35927
36027
|
endpoint;
|
|
35928
36028
|
keepAliveMs;
|
|
35929
|
-
sessionId =
|
|
36029
|
+
sessionId = randomUUID28();
|
|
35930
36030
|
onclose;
|
|
35931
36031
|
onerror;
|
|
35932
36032
|
onmessage;
|
|
@@ -36023,7 +36123,7 @@ data: ${JSON.stringify(message2)}
|
|
|
36023
36123
|
var init_sse_transport = () => {};
|
|
36024
36124
|
|
|
36025
36125
|
// ../../packages/mcp/src/server.ts
|
|
36026
|
-
import { createHash as createHash16, randomUUID as
|
|
36126
|
+
import { createHash as createHash16, randomUUID as randomUUID29 } from "crypto";
|
|
36027
36127
|
import { statSync as statSync17 } from "fs";
|
|
36028
36128
|
import { basename as basename10, extname as extname3, resolve as resolve21 } from "path";
|
|
36029
36129
|
import { McpServer as McpServer9 } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
@@ -36094,7 +36194,7 @@ async function deliverFile(ctx, filePath) {
|
|
|
36094
36194
|
return errorResult("Error: Failed to store file for delivery.");
|
|
36095
36195
|
const cfg = getApiTopicConfig(ctx.topicId);
|
|
36096
36196
|
const msg = {
|
|
36097
|
-
id:
|
|
36197
|
+
id: randomUUID29(),
|
|
36098
36198
|
topicId: ctx.topicId,
|
|
36099
36199
|
authorId: "ai",
|
|
36100
36200
|
sourceAdapter: "runtime.send_file",
|
|
@@ -36214,6 +36314,15 @@ function buildNegotiumMcpServer(ctx) {
|
|
|
36214
36314
|
unsupportedSurface: topic?.surface === "telegram"
|
|
36215
36315
|
});
|
|
36216
36316
|
server.tool(vaultTool.name, vaultTool.description, vaultTool.schema, vaultTool.handler);
|
|
36317
|
+
const deleteVaultTool = createDeleteVaultToolDefinition({
|
|
36318
|
+
userId: ctx.userId,
|
|
36319
|
+
topicId: ctx.topicId,
|
|
36320
|
+
queryId: ctx.queryId,
|
|
36321
|
+
agent: ctx.agent,
|
|
36322
|
+
model: ctx.model,
|
|
36323
|
+
...ctx.threadRootId ? { threadRootId: ctx.threadRootId } : {}
|
|
36324
|
+
});
|
|
36325
|
+
server.tool(deleteVaultTool.name, deleteVaultTool.description, deleteVaultTool.schema, deleteVaultTool.handler);
|
|
36217
36326
|
}
|
|
36218
36327
|
const peerBridge = ctx.peerBridge;
|
|
36219
36328
|
const canSpawnSubagents = peerBridge ? peerBridge.canSpawnSubagents : canSpawnSubagentsFromTopic(ctx.topicId);
|
|
@@ -36449,7 +36558,7 @@ async function handleSseMessage(req, url, token, surface) {
|
|
|
36449
36558
|
async function createStreamableSession(token, surface, server) {
|
|
36450
36559
|
let transport;
|
|
36451
36560
|
transport = new WebStandardStreamableHTTPServerTransport({
|
|
36452
|
-
sessionIdGenerator: () =>
|
|
36561
|
+
sessionIdGenerator: () => randomUUID29(),
|
|
36453
36562
|
onsessioninitialized: (sessionId) => {
|
|
36454
36563
|
streamableSessions.set(sessionId, {
|
|
36455
36564
|
tokenFingerprint: tokenFingerprint(token),
|
|
@@ -37547,7 +37656,7 @@ var init_scripts = __esm(async () => {
|
|
|
37547
37656
|
});
|
|
37548
37657
|
|
|
37549
37658
|
// ../../packages/module-cron/src/store.ts
|
|
37550
|
-
import { randomUUID as
|
|
37659
|
+
import { randomUUID as randomUUID30 } from "crypto";
|
|
37551
37660
|
function validateCronAgentConfig(topicId, agent, model, effort) {
|
|
37552
37661
|
if (agent !== undefined && !isAgentKind(agent)) {
|
|
37553
37662
|
throw new Error(`agent '${agent}' is not a recognized agent kind`);
|
|
@@ -37791,7 +37900,7 @@ function createCronJob(input) {
|
|
|
37791
37900
|
const now = input.now ?? new Date;
|
|
37792
37901
|
const nowIso = now.toISOString();
|
|
37793
37902
|
const job = {
|
|
37794
|
-
id:
|
|
37903
|
+
id: randomUUID30(),
|
|
37795
37904
|
name: input.name,
|
|
37796
37905
|
ownerUserId: input.ownerUserId,
|
|
37797
37906
|
actorOwnerUserId: input.actorOwnerUserId?.trim() || undefined,
|
|
@@ -38020,13 +38129,13 @@ function deleteCronJob(id) {
|
|
|
38020
38129
|
}
|
|
38021
38130
|
function requestCronRun(jobId, now = new Date) {
|
|
38022
38131
|
ensureCronSchema();
|
|
38023
|
-
const id =
|
|
38132
|
+
const id = randomUUID30();
|
|
38024
38133
|
db3.query("INSERT INTO negotium_cron_requests (id,job_id,requested_at) VALUES (?,?,?)").run(id, jobId, now.toISOString());
|
|
38025
38134
|
return id;
|
|
38026
38135
|
}
|
|
38027
38136
|
function requestCronCancel(jobId, now = new Date) {
|
|
38028
38137
|
ensureCronSchema();
|
|
38029
|
-
const id =
|
|
38138
|
+
const id = randomUUID30();
|
|
38030
38139
|
db3.query("INSERT INTO negotium_cron_cancellations (id,job_id,requested_at) VALUES (?,?,?)").run(id, jobId, now.toISOString());
|
|
38031
38140
|
return id;
|
|
38032
38141
|
}
|
|
@@ -38046,7 +38155,7 @@ function claimCronCancellations(limit = 100) {
|
|
|
38046
38155
|
}
|
|
38047
38156
|
function insertRun(jobId, topicId, source, scheduledAt) {
|
|
38048
38157
|
const run = {
|
|
38049
|
-
id:
|
|
38158
|
+
id: randomUUID30(),
|
|
38050
38159
|
jobId,
|
|
38051
38160
|
source,
|
|
38052
38161
|
scheduledAt,
|
|
@@ -39015,7 +39124,7 @@ var init_src4 = __esm(async () => {
|
|
|
39015
39124
|
});
|
|
39016
39125
|
|
|
39017
39126
|
// ../../packages/node/src/files.ts
|
|
39018
|
-
import { randomUUID as
|
|
39127
|
+
import { randomUUID as randomUUID31 } from "crypto";
|
|
39019
39128
|
import {
|
|
39020
39129
|
copyFileSync as copyFileSync4,
|
|
39021
39130
|
existsSync as existsSync37,
|
|
@@ -39139,7 +39248,7 @@ class NodeFileStore {
|
|
|
39139
39248
|
}
|
|
39140
39249
|
store(absPath, access = {}) {
|
|
39141
39250
|
this.#ensureDir();
|
|
39142
|
-
const fileId =
|
|
39251
|
+
const fileId = randomUUID31();
|
|
39143
39252
|
const extension = safeExtension(absPath);
|
|
39144
39253
|
const savedName = `${fileId}${extension}`;
|
|
39145
39254
|
const savedPath = join44(this.uploadDir, savedName);
|
|
@@ -39779,7 +39888,7 @@ var init_topic_link = __esm(async () => {
|
|
|
39779
39888
|
});
|
|
39780
39889
|
|
|
39781
39890
|
// ../../packages/node/src/control.ts
|
|
39782
|
-
import { randomUUID as
|
|
39891
|
+
import { randomUUID as randomUUID32, timingSafeEqual as timingSafeEqual4 } from "crypto";
|
|
39783
39892
|
import {
|
|
39784
39893
|
chmodSync as chmodSync6,
|
|
39785
39894
|
existsSync as existsSync38,
|
|
@@ -40369,6 +40478,7 @@ function createNodeControlHandler(options) {
|
|
|
40369
40478
|
allowAutoContinue: body.allowAutoContinue !== false,
|
|
40370
40479
|
respond: body.respond !== false,
|
|
40371
40480
|
silent: body.silent === true,
|
|
40481
|
+
steer: body.steer !== false,
|
|
40372
40482
|
visualTools: body.visualTools === true,
|
|
40373
40483
|
fileDeliveryTools: body.fileDeliveryTools === true,
|
|
40374
40484
|
hostMcpServers,
|
|
@@ -40435,7 +40545,7 @@ function createNodeControlHandler(options) {
|
|
|
40435
40545
|
return jsonError(404, "Topic not found");
|
|
40436
40546
|
const text3 = requiredText(body.text, "text");
|
|
40437
40547
|
const message2 = {
|
|
40438
|
-
id:
|
|
40548
|
+
id: randomUUID32(),
|
|
40439
40549
|
topicId,
|
|
40440
40550
|
authorId: "system",
|
|
40441
40551
|
text: text3,
|
|
@@ -40738,6 +40848,22 @@ function createNodeControlHandler(options) {
|
|
|
40738
40848
|
aborted: topicService.abortTurn(topicId, userId)
|
|
40739
40849
|
});
|
|
40740
40850
|
}
|
|
40851
|
+
const runtimeSteerQueuedMatch = runtimePath.match(/^\/topics\/([^/]+)\/steer-queued$/);
|
|
40852
|
+
if (runtimeSteerQueuedMatch && req.method === "POST") {
|
|
40853
|
+
const body = await bodyRecord(req);
|
|
40854
|
+
if (body.v !== NODE_RUNTIME_CONTRACT_VERSION)
|
|
40855
|
+
return jsonError(400, "Unsupported v");
|
|
40856
|
+
const topicId = decodeURIComponent(runtimeSteerQueuedMatch[1]);
|
|
40857
|
+
const topic = getTopic(topicId);
|
|
40858
|
+
if (!topic || !topicInRequestScope(req, topic))
|
|
40859
|
+
return jsonError(404, "Topic not found");
|
|
40860
|
+
const userId = requiredText(body.userId, "userId");
|
|
40861
|
+
return Response.json({
|
|
40862
|
+
ok: true,
|
|
40863
|
+
v: NODE_RUNTIME_CONTRACT_VERSION,
|
|
40864
|
+
steered: topicService.steerQueuedTurn(topicId, userId)
|
|
40865
|
+
});
|
|
40866
|
+
}
|
|
40741
40867
|
const runtimeSessionCommInboxMatch = runtimePath.match(/^\/topics\/([^/]+)\/session-comm\/inbox$/);
|
|
40742
40868
|
if (runtimeSessionCommInboxMatch && req.method === "POST") {
|
|
40743
40869
|
try {
|
|
@@ -41355,6 +41481,13 @@ function createNodeControlHandler(options) {
|
|
|
41355
41481
|
const userId = requiredText(body.userId, "userId");
|
|
41356
41482
|
return Response.json({ ok: true, aborted: topicService.abortTurn(topicId, userId) });
|
|
41357
41483
|
}
|
|
41484
|
+
const steerQueuedMatch = path.match(/^\/topics\/([^/]+)\/steer-queued$/);
|
|
41485
|
+
if (steerQueuedMatch && req.method === "POST") {
|
|
41486
|
+
const topicId = decodeURIComponent(steerQueuedMatch[1]);
|
|
41487
|
+
const body = await bodyRecord(req);
|
|
41488
|
+
const userId = requiredText(body.userId, "userId");
|
|
41489
|
+
return Response.json({ ok: true, steered: topicService.steerQueuedTurn(topicId, userId) });
|
|
41490
|
+
}
|
|
41358
41491
|
const resetMatch = path.match(/^\/topics\/([^/]+)\/session\/reset$/);
|
|
41359
41492
|
if (resetMatch && req.method === "POST") {
|
|
41360
41493
|
const topicId = decodeURIComponent(resetMatch[1]);
|
|
@@ -41416,8 +41549,9 @@ function createNodeControlHandler(options) {
|
|
|
41416
41549
|
const body = await bodyRecord(req);
|
|
41417
41550
|
const topicId = requiredText(body.topicId, "topicId");
|
|
41418
41551
|
const userId = requiredText(body.userId, "userId");
|
|
41419
|
-
const
|
|
41420
|
-
const
|
|
41552
|
+
const kind = body.kind === "custom" || body.kind === "skip" ? body.kind : undefined;
|
|
41553
|
+
const label = kind === "skip" ? "" : requiredText(body.label, "label");
|
|
41554
|
+
const result = topicService.answerQuestion(topicId, messageId, label, userId, { kind });
|
|
41421
41555
|
return Response.json(result, { status: result.ok ? 200 : 409 });
|
|
41422
41556
|
}
|
|
41423
41557
|
const vaultAnswerMatch = path.match(/^\/vault-requests\/([^/]+)\/answer$/);
|
|
@@ -41469,7 +41603,7 @@ function writeNodeDaemonInfo(port, startedAt) {
|
|
|
41469
41603
|
startedAt
|
|
41470
41604
|
};
|
|
41471
41605
|
mkdirSync32(dirname21(NODE_DAEMON_INFO_PATH), { recursive: true });
|
|
41472
|
-
const temporary = `${NODE_DAEMON_INFO_PATH}.${process.pid}.${
|
|
41606
|
+
const temporary = `${NODE_DAEMON_INFO_PATH}.${process.pid}.${randomUUID32()}.tmp`;
|
|
41473
41607
|
writeFileSync25(temporary, `${JSON.stringify(info, null, 2)}
|
|
41474
41608
|
`, { mode: 384 });
|
|
41475
41609
|
chmodSync6(temporary, 384);
|
|
@@ -42214,6 +42348,11 @@ var init_commands = __esm(() => {
|
|
|
42214
42348
|
description: "open the Vault editor or run a compact Vault command"
|
|
42215
42349
|
},
|
|
42216
42350
|
{ name: "abort", usage: "/abort", description: "stop the active turn" },
|
|
42351
|
+
{
|
|
42352
|
+
name: "steer",
|
|
42353
|
+
usage: "/steer [message]",
|
|
42354
|
+
description: "interrupt the running turn: with a message, fold it in; alone, run the queued ones"
|
|
42355
|
+
},
|
|
42217
42356
|
{ name: "help", usage: "/help", description: "show keyboard help" },
|
|
42218
42357
|
{ name: "quit", usage: "/quit", description: "exit Terminal" }
|
|
42219
42358
|
];
|
|
@@ -42505,6 +42644,15 @@ var DEFAULT_SUBAGENT_GRAPH_SPACING = 4, MIN_SUBAGENT_GRAPH_SPACING = 2, MAX_SUBA
|
|
|
42505
42644
|
var init_subagent_graph = () => {};
|
|
42506
42645
|
|
|
42507
42646
|
// ../../adapters/terminal/src/state.ts
|
|
42647
|
+
function queueMessage(state, topicId, message2) {
|
|
42648
|
+
const current3 = state.queued[topicId] ?? [];
|
|
42649
|
+
if (current3.some((item) => item.id === message2.id))
|
|
42650
|
+
return state;
|
|
42651
|
+
return { ...state, queued: { ...state.queued, [topicId]: [...current3, message2] } };
|
|
42652
|
+
}
|
|
42653
|
+
function isQueuedMessage(state, topicId, messageId) {
|
|
42654
|
+
return (state.queued[topicId] ?? []).some((item) => item.id === messageId);
|
|
42655
|
+
}
|
|
42508
42656
|
function createInitialState(userId) {
|
|
42509
42657
|
return {
|
|
42510
42658
|
userId,
|
|
@@ -42517,6 +42665,7 @@ function createInitialState(userId) {
|
|
|
42517
42665
|
messageHistory: {},
|
|
42518
42666
|
activity: {},
|
|
42519
42667
|
unread: {},
|
|
42668
|
+
queued: {},
|
|
42520
42669
|
input: "",
|
|
42521
42670
|
inputCursor: { row: 0, col: 0 },
|
|
42522
42671
|
suggestionIndex: 0,
|
|
@@ -42605,6 +42754,9 @@ function setTopicUsage(state, usage) {
|
|
|
42605
42754
|
topicUsage: { ...state.topicUsage, [usage.topicId]: usage }
|
|
42606
42755
|
};
|
|
42607
42756
|
}
|
|
42757
|
+
function askRowCount(choiceCount) {
|
|
42758
|
+
return choiceCount + 2;
|
|
42759
|
+
}
|
|
42608
42760
|
function activeQuestion(state) {
|
|
42609
42761
|
return activeMessages(state).slice().reverse().find((message2) => message2.kind === "ask_user_question" && message2.askUserQuestion && !message2.askUserQuestion.expired && !message2.askUserQuestion.selectedLabel) ?? null;
|
|
42610
42762
|
}
|
|
@@ -43104,7 +43256,8 @@ function applyAiStatus(state, topicId, raw, createdAt) {
|
|
|
43104
43256
|
delete liveCurrent.snapshot;
|
|
43105
43257
|
if (kind === "ai_active") {
|
|
43106
43258
|
const queryId = String(status.queryId ?? "");
|
|
43107
|
-
|
|
43259
|
+
const drained = state.queued[topicId]?.length && !queryId.startsWith("terminal-pending-") && queryId !== current3.queryId ? { ...state, queued: { ...state.queued, [topicId]: [] } } : state;
|
|
43260
|
+
return setActivity(drained, topicId, {
|
|
43108
43261
|
running: true,
|
|
43109
43262
|
queryId,
|
|
43110
43263
|
startedAtMs: current3.running && current3.queryId === queryId && current3.startedAtMs !== undefined ? current3.startedAtMs : activityStartMs(createdAt),
|
|
@@ -44130,19 +44283,27 @@ function renderTable(rows, width) {
|
|
|
44130
44283
|
}
|
|
44131
44284
|
}
|
|
44132
44285
|
const alignments = Array.from({ length: colCount }, (_, index) => alignmentFromSeparator(separators?.[index] ?? ""));
|
|
44133
|
-
function
|
|
44134
|
-
const cleaned = cleanInlineMarkdown(text3);
|
|
44286
|
+
function alignLine(cleaned, colWidth, align) {
|
|
44135
44287
|
const visual = displayWidth(cleaned);
|
|
44136
|
-
if (visual
|
|
44137
|
-
|
|
44138
|
-
|
|
44139
|
-
|
|
44140
|
-
|
|
44141
|
-
|
|
44142
|
-
}
|
|
44143
|
-
return fit(cleaned, colWidth);
|
|
44288
|
+
if (visual > colWidth)
|
|
44289
|
+
return sliceWidth(cleaned, colWidth);
|
|
44290
|
+
if (align === "right")
|
|
44291
|
+
return `${" ".repeat(colWidth - visual)}${cleaned}`;
|
|
44292
|
+
if (align === "center") {
|
|
44293
|
+
const left = Math.floor((colWidth - visual) / 2);
|
|
44294
|
+
return `${" ".repeat(left)}${cleaned}${" ".repeat(colWidth - visual - left)}`;
|
|
44144
44295
|
}
|
|
44145
|
-
return
|
|
44296
|
+
return fit(cleaned, colWidth);
|
|
44297
|
+
}
|
|
44298
|
+
function cellLines(text3, colWidth, align) {
|
|
44299
|
+
const cleaned = cleanInlineMarkdown(text3);
|
|
44300
|
+
const wrapped = displayWidth(cleaned) <= colWidth ? [cleaned] : wrapText(cleaned, colWidth);
|
|
44301
|
+
return wrapped.map((part) => alignLine(part, colWidth, align));
|
|
44302
|
+
}
|
|
44303
|
+
function rowLines(row, options) {
|
|
44304
|
+
const cells = Array.from({ length: colCount }, (_, index) => cellLines(row[index] ?? "", colWidths[index] ?? 0, alignments[index]));
|
|
44305
|
+
const height = Math.max(1, ...cells.map((cell) => cell.length));
|
|
44306
|
+
return Array.from({ length: height }, (_, lineIndex) => line(joinRow(cells.map((cell, index) => cell[lineIndex] ?? " ".repeat(colWidths[index] ?? 0))), options));
|
|
44146
44307
|
}
|
|
44147
44308
|
const borderColor = theme.border;
|
|
44148
44309
|
const result = [];
|
|
@@ -44150,11 +44311,11 @@ function renderTable(rows, width) {
|
|
|
44150
44311
|
const border = (left, middle, right) => ` ${left}${colWidths.map((columnWidth) => "\u2500".repeat(columnWidth + 2)).join(middle)}${right}`;
|
|
44151
44312
|
result.push(line(border("\u250C", "\u252C", "\u2510"), { fg: borderColor }));
|
|
44152
44313
|
if (visibleHeader) {
|
|
44153
|
-
result.push(
|
|
44314
|
+
result.push(...rowLines(visibleHeader, { fg: theme.accent, bold: true }));
|
|
44154
44315
|
result.push(line(border("\u251C", "\u253C", "\u2524"), { fg: borderColor }));
|
|
44155
44316
|
}
|
|
44156
44317
|
for (const row of visibleBodyRows) {
|
|
44157
|
-
result.push(
|
|
44318
|
+
result.push(...rowLines(row, { fg: theme.text }));
|
|
44158
44319
|
}
|
|
44159
44320
|
result.push(line(border("\u2514", "\u2534", "\u2518"), { fg: borderColor }));
|
|
44160
44321
|
return result;
|
|
@@ -44750,7 +44911,8 @@ function helpLines() {
|
|
|
44750
44911
|
return [
|
|
44751
44912
|
line(" Keyboard", { fg: theme.accent, bold: true }),
|
|
44752
44913
|
line(""),
|
|
44753
|
-
line(" Shift-Enter / Ctrl-Enter newline \xB7 Alt-Enter
|
|
44914
|
+
line(" Shift-Enter / Ctrl-Enter / Ctrl-J newline \xB7 Alt-Enter steer (interrupt running turn)"),
|
|
44915
|
+
line(" Enter while a turn runs queues the message \xB7 /steer [message] does the same as Alt-Enter"),
|
|
44754
44916
|
line(" \u2190 \u2192 move \xB7 Ctrl/Alt-\u2190 \u2192 move by word \xB7 \u2191 \u2193 history"),
|
|
44755
44917
|
line(" Alt-Backspace delete word \xB7 Ctrl-U clear before cursor"),
|
|
44756
44918
|
line(" Cmd-Backspace works when forwarded \xB7 Ctrl-W/K aliases"),
|
|
@@ -44766,7 +44928,7 @@ function helpLines() {
|
|
|
44766
44928
|
line(" Commands", { fg: theme.cyan, bold: true }),
|
|
44767
44929
|
line(" /new /model /effort /status /context"),
|
|
44768
44930
|
line(" /topics /fork /spawn"),
|
|
44769
|
-
line(" /del /copy /abort /help /quit", { fg: theme.muted })
|
|
44931
|
+
line(" /del /copy /abort /steer /help /quit", { fg: theme.muted })
|
|
44770
44932
|
];
|
|
44771
44933
|
}
|
|
44772
44934
|
function tokenCount(value) {
|
|
@@ -45270,7 +45432,7 @@ function effortOverlayLines(state) {
|
|
|
45270
45432
|
}
|
|
45271
45433
|
function conversationContentLines(state, width, animationFrame = 0, nowMs = terminalNowMs(), includeTasks = true) {
|
|
45272
45434
|
const all = [];
|
|
45273
|
-
for (const message2 of activeMessages(state).filter((item) => !item.id.startsWith("tasks-") && item.kind !== "system" && (item.authorId !== "system" || isVisibleSystemMessage(item)))) {
|
|
45435
|
+
for (const message2 of activeMessages(state).filter((item) => !isQueuedMessage(state, item.topicId, item.id) && !item.id.startsWith("tasks-") && item.kind !== "system" && (item.authorId !== "system" || isVisibleSystemMessage(item)))) {
|
|
45274
45436
|
all.push(...messageLines(message2, width, state.userId));
|
|
45275
45437
|
}
|
|
45276
45438
|
all.push(...activityLines(state, animationFrame, nowMs));
|
|
@@ -45365,17 +45527,39 @@ function decisionPane(state, width) {
|
|
|
45365
45527
|
const question = ask?.askUserQuestion;
|
|
45366
45528
|
if (!ask || !question?.choices.length)
|
|
45367
45529
|
return [];
|
|
45368
|
-
const selected = Math.min(state.askChoiceIndex, question.choices.length - 1);
|
|
45530
|
+
const selected = Math.min(state.askChoiceIndex, askRowCount(question.choices.length) - 1);
|
|
45369
45531
|
const boxWidth = popupPaneWidth(width);
|
|
45532
|
+
const rowTexts = [
|
|
45533
|
+
...question.choices.map((choice) => `${choice.label}${choice.description ? ` \u2014 ${choice.description}` : ""}`),
|
|
45534
|
+
"\u270E Type your own answer below",
|
|
45535
|
+
"\u293C Skip"
|
|
45536
|
+
];
|
|
45370
45537
|
const content = [
|
|
45371
45538
|
line(` ${question.question}`, { bold: true }),
|
|
45372
|
-
...
|
|
45539
|
+
...rowTexts.map((text3, index) => line(` ${index === selected ? "\u25CF" : "\u25CB"} ${text3}`, {
|
|
45373
45540
|
fg: index === selected ? theme.text : theme.muted,
|
|
45374
45541
|
bg: index === selected ? theme.selected : theme.surface,
|
|
45375
45542
|
bold: index === selected
|
|
45376
45543
|
}))
|
|
45377
45544
|
];
|
|
45378
|
-
const rows = framePane("decision required \xB7 \u2191\u2193 select \xB7 Enter confirm", content, boxWidth, Math.min(
|
|
45545
|
+
const rows = framePane("decision required \xB7 \u2191\u2193 select \xB7 Enter confirm \xB7 or type an answer", content, boxWidth, Math.min(12, Math.max(4, content.length + 2)), { active: true, accent: theme.amber });
|
|
45546
|
+
return centerPaneRows(rows, boxWidth, width);
|
|
45547
|
+
}
|
|
45548
|
+
function queuedPane(state, width) {
|
|
45549
|
+
if (state.overlay || !state.activeTopicId)
|
|
45550
|
+
return [];
|
|
45551
|
+
const queued = state.queued[state.activeTopicId] ?? [];
|
|
45552
|
+
if (queued.length === 0)
|
|
45553
|
+
return [];
|
|
45554
|
+
const boxWidth = popupPaneWidth(width);
|
|
45555
|
+
const shown = queued.slice(-3);
|
|
45556
|
+
const hidden = queued.length - shown.length;
|
|
45557
|
+
const textWidth = Math.max(4, boxWidth - 8);
|
|
45558
|
+
const content = [
|
|
45559
|
+
...hidden > 0 ? [line(` \u2026 ${hidden} earlier queued`, { fg: theme.muted })] : [],
|
|
45560
|
+
...shown.map((item) => line(` \u203A ${sliceWidth(item.text.replace(/\s+/g, " "), textWidth)}`, { fg: theme.muted }))
|
|
45561
|
+
];
|
|
45562
|
+
const rows = framePane("queued \xB7 runs after this turn \xB7 Alt-Enter steers", content, boxWidth, content.length + 2, { active: true, accent: theme.amber });
|
|
45379
45563
|
return centerPaneRows(rows, boxWidth, width);
|
|
45380
45564
|
}
|
|
45381
45565
|
function vaultRequestPane(state, width) {
|
|
@@ -45437,7 +45621,7 @@ function inputVisualLines(state, width) {
|
|
|
45437
45621
|
`).map((row) => "*".repeat(Array.from(row).length)).join(`
|
|
45438
45622
|
`) : state.input;
|
|
45439
45623
|
if (!displayInput) {
|
|
45440
|
-
const placeholder = state.overlay === "vault" ? state.vaultMode === "list" ? "Type /vault set \u2026 or /vault del \u2026" : state.vaultMode === "key" ? "Type a key name\u2026" : state.vaultMode === "value" ? "Type the secret value\u2026" : "Optional description\u2026" : vaultRequest?.vaultSecretRequest ? state.vaultRequestMode === "confirm-decline" ? "Decline this request? y / n" : `Type or paste the value for ${vaultRequest.vaultSecretRequest.key}\u2026` : state.creatingTopic ? "Type a topic name\u2026" : "Type a message or /command\u2026";
|
|
45624
|
+
const placeholder = state.overlay === "vault" ? state.vaultMode === "list" ? "Type /vault set \u2026 or /vault del \u2026" : state.vaultMode === "key" ? "Type a key name\u2026" : state.vaultMode === "value" ? "Type the secret value\u2026" : "Optional description\u2026" : vaultRequest?.vaultSecretRequest ? state.vaultRequestMode === "confirm-decline" ? "Decline this request? y / n" : `Type or paste the value for ${vaultRequest.vaultSecretRequest.key}\u2026` : state.creatingTopic ? "Type a topic name\u2026" : activeQuestion(state)?.askUserQuestion ? "Type your own answer, or pick one above\u2026" : "Type a message or /command\u2026";
|
|
45441
45625
|
return {
|
|
45442
45626
|
lines: [
|
|
45443
45627
|
line(`${leadPrefix}${gutter ? " " : ""}${placeholder}`, {
|
|
@@ -45734,7 +45918,8 @@ function renderAppFrame(state, columns, rows, animationFrame = 0, nowMs = termin
|
|
|
45734
45918
|
const footer = shiftLines(footerLines(state, layout.conversationWidth), conversationXStart - 1);
|
|
45735
45919
|
const decision = shiftLines([
|
|
45736
45920
|
...decisionPane(state, layout.conversationWidth),
|
|
45737
|
-
...vaultRequestPane(state, layout.conversationWidth)
|
|
45921
|
+
...vaultRequestPane(state, layout.conversationWidth),
|
|
45922
|
+
...queuedPane(state, layout.conversationWidth)
|
|
45738
45923
|
], conversationXStart - 1);
|
|
45739
45924
|
const hideComposer = state.overlay === "background-session" || state.overlay === "topics" || state.overlay === "subagents" || state.overlay === "decisions" || state.overlay === "vault" && state.vaultMode === "confirm-delete";
|
|
45740
45925
|
const composer = hideComposer ? { lines: [], cursor: null } : shiftComposerPane(composerPane(state, layout.conversationWidth), conversationXStart - 1);
|
|
@@ -46137,6 +46322,9 @@ function normalizeKeySequences(chunk) {
|
|
|
46137
46322
|
return mods === 0 ? `${ESC_CHAR}[${code}~` : `${ESC_CHAR}[${code};${encodeModifiers(mods)}~`;
|
|
46138
46323
|
});
|
|
46139
46324
|
}
|
|
46325
|
+
function terminalSteerShortcut(chunk) {
|
|
46326
|
+
return STEER_KEY_PATTERN.test(chunk);
|
|
46327
|
+
}
|
|
46140
46328
|
function terminalNewlineShortcut(chunk) {
|
|
46141
46329
|
return NEWLINE_KEY_CHUNKS.has(chunk) || MODIFIED_ENTER_PATTERN.test(chunk);
|
|
46142
46330
|
}
|
|
@@ -46265,7 +46453,7 @@ function topicFilterPasteText(payload) {
|
|
|
46265
46453
|
return sanitizePastedText(payload).replaceAll(`
|
|
46266
46454
|
`, " ");
|
|
46267
46455
|
}
|
|
46268
|
-
var MESSAGE_MUTATING_AI_STATUS_KINDS, SGR_MOUSE_PATTERN, TERMINAL_VAULT_USAGE = "Usage: /vault, /vault list, /vault set KEY VALUE [description], or /vault del KEY", BRACKETED_PASTE_START = "\x1B[200~", BRACKETED_PASTE_END = "\x1B[201~", PASTED_TAB_WIDTH, ESC2 = "\\u001b", ESC_CHAR = "\x1B", BEL = "\\u0007", OSC_PATTERN, STRING_COMMAND_PATTERN, CSI_PATTERN, SS3_PATTERN, LONE_ESCAPE_PATTERN, REMAINING_CONTROL_PATTERN, MAX_ESCAPE_CARRY = 32, SS3_CURSOR_PATTERN, MOD_SHIFT = 1, MOD_ALT = 2, MOD_CTRL = 4, MOD_LOCKS = 192, MOD_EXOTIC = 56, CTRL_BYTES, LEGACY_TEXT_KEYS, CSI_U_PATTERN, CSI_LETTER_PATTERN, CSI_TILDE_PATTERN, NEWLINE_KEY_CHUNKS, MODIFIED_ENTER_PATTERN;
|
|
46456
|
+
var MESSAGE_MUTATING_AI_STATUS_KINDS, SGR_MOUSE_PATTERN, TERMINAL_VAULT_USAGE = "Usage: /vault, /vault list, /vault set KEY VALUE [description], or /vault del KEY", BRACKETED_PASTE_START = "\x1B[200~", BRACKETED_PASTE_END = "\x1B[201~", PASTED_TAB_WIDTH, ESC2 = "\\u001b", ESC_CHAR = "\x1B", BEL = "\\u0007", OSC_PATTERN, STRING_COMMAND_PATTERN, CSI_PATTERN, SS3_PATTERN, LONE_ESCAPE_PATTERN, REMAINING_CONTROL_PATTERN, MAX_ESCAPE_CARRY = 32, SS3_CURSOR_PATTERN, MOD_SHIFT = 1, MOD_ALT = 2, MOD_CTRL = 4, MOD_LOCKS = 192, MOD_EXOTIC = 56, CTRL_BYTES, LEGACY_TEXT_KEYS, CSI_U_PATTERN, CSI_LETTER_PATTERN, CSI_TILDE_PATTERN, NEWLINE_KEY_CHUNKS, MODIFIED_ENTER_PATTERN, STEER_KEY_PATTERN;
|
|
46269
46457
|
var init_app_helpers = __esm(async () => {
|
|
46270
46458
|
await __promiseAll([
|
|
46271
46459
|
init_src(),
|
|
@@ -46312,6 +46500,7 @@ var init_app_helpers = __esm(async () => {
|
|
|
46312
46500
|
`, `
|
|
46313
46501
|
`]);
|
|
46314
46502
|
MODIFIED_ENTER_PATTERN = new RegExp(`^(?:${ESC2}\\[13;[2-9]u|${ESC2}\\[27;[2-9];13~)$`);
|
|
46503
|
+
STEER_KEY_PATTERN = new RegExp(`^(?:${ESC2}\r|${ESC2}\\[13;3u|${ESC2}\\[27;3;13~)$`);
|
|
46315
46504
|
});
|
|
46316
46505
|
|
|
46317
46506
|
// ../../adapters/terminal/src/history-store.ts
|
|
@@ -46368,9 +46557,9 @@ __export(exports_client, {
|
|
|
46368
46557
|
INITIAL_MESSAGE_HISTORY_LIMIT: () => INITIAL_MESSAGE_HISTORY_LIMIT,
|
|
46369
46558
|
EmbeddedNegotiumClient: () => EmbeddedNegotiumClient
|
|
46370
46559
|
});
|
|
46371
|
-
import { randomUUID as
|
|
46560
|
+
import { randomUUID as randomUUID33 } from "crypto";
|
|
46372
46561
|
function terminalClientMessageId() {
|
|
46373
|
-
return `terminal:${
|
|
46562
|
+
return `terminal:${randomUUID33()}`;
|
|
46374
46563
|
}
|
|
46375
46564
|
function retryableGatewaySubmission(error2) {
|
|
46376
46565
|
return error2 instanceof RuntimeGatewayError && (error2.kind === "transport" || error2.kind === "timeout" || error2.kind === "http" && (error2.status ?? 0) >= 500);
|
|
@@ -46512,7 +46701,7 @@ class EmbeddedNegotiumClient {
|
|
|
46512
46701
|
async deleteTopic(topic) {
|
|
46513
46702
|
await topicService.delete({ topicId: topic.id, userId: this.#userId });
|
|
46514
46703
|
}
|
|
46515
|
-
sendMessage(topic, text3) {
|
|
46704
|
+
sendMessage(topic, text3, options) {
|
|
46516
46705
|
const clientMessageId = terminalClientMessageId();
|
|
46517
46706
|
return submitRuntimeGatewayTurn({
|
|
46518
46707
|
topic,
|
|
@@ -46521,12 +46710,13 @@ class EmbeddedNegotiumClient {
|
|
|
46521
46710
|
sourceAdapter: "terminal",
|
|
46522
46711
|
clientMessageId,
|
|
46523
46712
|
requestId: clientMessageId,
|
|
46713
|
+
steer: options?.steer === true,
|
|
46524
46714
|
visualTools: false,
|
|
46525
46715
|
fileDeliveryTools: false
|
|
46526
46716
|
}).message;
|
|
46527
46717
|
}
|
|
46528
|
-
answerQuestion(topicId, messageId, label) {
|
|
46529
|
-
const result = topicService.answerQuestion(topicId, messageId, label, this.#userId);
|
|
46718
|
+
answerQuestion(topicId, messageId, label, options) {
|
|
46719
|
+
const result = topicService.answerQuestion(topicId, messageId, label, this.#userId, options);
|
|
46530
46720
|
return result.ok ? { ok: true } : { ok: false, error: result.error };
|
|
46531
46721
|
}
|
|
46532
46722
|
answerVaultRequest(topicId, messageId, value) {
|
|
@@ -46536,6 +46726,9 @@ class EmbeddedNegotiumClient {
|
|
|
46536
46726
|
abort(topicId) {
|
|
46537
46727
|
return topicService.abortTurn(topicId, this.#userId);
|
|
46538
46728
|
}
|
|
46729
|
+
steerQueued(topicId) {
|
|
46730
|
+
return topicService.steerQueuedTurn(topicId, this.#userId);
|
|
46731
|
+
}
|
|
46539
46732
|
runVaultCommand(commandLine) {
|
|
46540
46733
|
return executeVaultCommand(this.#userId, commandLine);
|
|
46541
46734
|
}
|
|
@@ -46713,7 +46906,7 @@ class RemoteNegotiumClient {
|
|
|
46713
46906
|
async deleteTopic(topic) {
|
|
46714
46907
|
await this.#request(`/topics/${encodeURIComponent(topic.id)}?user=${encodeURIComponent(this.#userId)}`, { method: "DELETE" });
|
|
46715
46908
|
}
|
|
46716
|
-
async sendMessage(topic, text3) {
|
|
46909
|
+
async sendMessage(topic, text3, options) {
|
|
46717
46910
|
const clientMessageId = terminalClientMessageId();
|
|
46718
46911
|
const acknowledgement = await submitTerminalGatewayTurn(this.#gateway, {
|
|
46719
46912
|
topicId: topic.id,
|
|
@@ -46722,6 +46915,7 @@ class RemoteNegotiumClient {
|
|
|
46722
46915
|
text: text3,
|
|
46723
46916
|
clientMessageId,
|
|
46724
46917
|
requestId: clientMessageId,
|
|
46918
|
+
steer: options?.steer === true,
|
|
46725
46919
|
visualTools: false,
|
|
46726
46920
|
fileDeliveryTools: false
|
|
46727
46921
|
});
|
|
@@ -46735,11 +46929,11 @@ class RemoteNegotiumClient {
|
|
|
46735
46929
|
createdAt: new Date().toISOString()
|
|
46736
46930
|
};
|
|
46737
46931
|
}
|
|
46738
|
-
async answerQuestion(topicId, messageId, label) {
|
|
46932
|
+
async answerQuestion(topicId, messageId, label, options) {
|
|
46739
46933
|
try {
|
|
46740
46934
|
const result = await this.#request(`/questions/${encodeURIComponent(messageId)}/answer`, {
|
|
46741
46935
|
method: "POST",
|
|
46742
|
-
body: JSON.stringify({ topicId, userId: this.#userId, label })
|
|
46936
|
+
body: JSON.stringify({ topicId, userId: this.#userId, label, kind: options?.kind })
|
|
46743
46937
|
});
|
|
46744
46938
|
return result.ok ? { ok: true } : { ok: false, error: result.error };
|
|
46745
46939
|
} catch (error2) {
|
|
@@ -46764,6 +46958,13 @@ class RemoteNegotiumClient {
|
|
|
46764
46958
|
});
|
|
46765
46959
|
return result.aborted === true;
|
|
46766
46960
|
}
|
|
46961
|
+
async steerQueued(topicId) {
|
|
46962
|
+
const result = await this.#request(`/topics/${encodeURIComponent(topicId)}/steer-queued`, {
|
|
46963
|
+
method: "POST",
|
|
46964
|
+
body: JSON.stringify({ userId: this.#userId })
|
|
46965
|
+
});
|
|
46966
|
+
return result.steered === true;
|
|
46967
|
+
}
|
|
46767
46968
|
async runVaultCommand(commandLine) {
|
|
46768
46969
|
const result = await this.#request("/vault/command", {
|
|
46769
46970
|
method: "POST",
|
|
@@ -49448,6 +49649,10 @@ class TerminalApp {
|
|
|
49448
49649
|
this.#submit();
|
|
49449
49650
|
return;
|
|
49450
49651
|
}
|
|
49652
|
+
if (terminalSteerShortcut(chunk) && !this.#state.overlay && !this.#state.creatingTopic && !activeQuestion(this.#state) && !activeVaultRequest(this.#state)) {
|
|
49653
|
+
this.#submit(true);
|
|
49654
|
+
return;
|
|
49655
|
+
}
|
|
49451
49656
|
if (terminalNewlineShortcut(chunk)) {
|
|
49452
49657
|
this.#input.insert(`
|
|
49453
49658
|
`);
|
|
@@ -49487,7 +49692,7 @@ class TerminalApp {
|
|
|
49487
49692
|
this.#queueRender();
|
|
49488
49693
|
}
|
|
49489
49694
|
}
|
|
49490
|
-
async#submit() {
|
|
49695
|
+
async#submit(forceSteer = false) {
|
|
49491
49696
|
if (this.#state.overlay === "vault" && this.#state.vaultMode !== "list" && this.#state.vaultMode !== "confirm-delete") {
|
|
49492
49697
|
await this.#submitVaultField();
|
|
49493
49698
|
return;
|
|
@@ -49498,22 +49703,16 @@ class TerminalApp {
|
|
|
49498
49703
|
}
|
|
49499
49704
|
const ask = activeQuestion(this.#state);
|
|
49500
49705
|
if (ask?.askUserQuestion?.choices.length) {
|
|
49501
|
-
|
|
49502
|
-
const choice = ask.askUserQuestion.choices[index];
|
|
49503
|
-
const result = await this.#client.answerQuestion(ask.topicId, ask.id, choice.label);
|
|
49504
|
-
this.#state = {
|
|
49505
|
-
...this.#state,
|
|
49506
|
-
askChoiceIndex: 0,
|
|
49507
|
-
notice: result.ok ? undefined : result.error,
|
|
49508
|
-
noticeLevel: result.ok ? undefined : "error"
|
|
49509
|
-
};
|
|
49510
|
-
this.#queueRender();
|
|
49706
|
+
await this.#answerAsk(ask);
|
|
49511
49707
|
return;
|
|
49512
49708
|
}
|
|
49513
49709
|
const displayText = this.#input.text.trim();
|
|
49514
|
-
|
|
49515
|
-
if (!text3)
|
|
49710
|
+
let text3 = this.#collapsedPastes.expand(displayText).trim();
|
|
49711
|
+
if (!text3) {
|
|
49712
|
+
if (forceSteer)
|
|
49713
|
+
await this.#steerQueued();
|
|
49516
49714
|
return;
|
|
49715
|
+
}
|
|
49517
49716
|
const inVaultCommandScreen = this.#state.overlay === "vault" && this.#state.vaultMode === "list";
|
|
49518
49717
|
if (inVaultCommandScreen && !isVaultCommandLine(text3)) {
|
|
49519
49718
|
this.#input.setText("");
|
|
@@ -49553,7 +49752,15 @@ class TerminalApp {
|
|
|
49553
49752
|
notice: undefined,
|
|
49554
49753
|
noticeLevel: undefined
|
|
49555
49754
|
};
|
|
49556
|
-
if (
|
|
49755
|
+
if (text3 === "/steer") {
|
|
49756
|
+
await this.#steerQueued();
|
|
49757
|
+
return;
|
|
49758
|
+
}
|
|
49759
|
+
const steerMatch = /^\/steer\s+([\s\S]+)$/.exec(text3);
|
|
49760
|
+
if (steerMatch)
|
|
49761
|
+
text3 = steerMatch[1].trim();
|
|
49762
|
+
const steer = forceSteer || steerMatch !== null;
|
|
49763
|
+
if (!steer && (isKnownTerminalCommand(text3) || isVaultCommandLine(text3))) {
|
|
49557
49764
|
await this.#runCommand(text3);
|
|
49558
49765
|
return;
|
|
49559
49766
|
}
|
|
@@ -49563,16 +49770,32 @@ class TerminalApp {
|
|
|
49563
49770
|
this.#queueRender();
|
|
49564
49771
|
return;
|
|
49565
49772
|
}
|
|
49773
|
+
const runningQueryId = this.#state.activity[topic.id]?.running ? this.#state.activity[topic.id]?.queryId : undefined;
|
|
49774
|
+
const wasRunning = runningQueryId !== undefined;
|
|
49566
49775
|
const optimisticQueryId = `terminal-pending-${Date.now()}`;
|
|
49567
|
-
|
|
49776
|
+
const queuing = wasRunning && !steer;
|
|
49777
|
+
if (steer && wasRunning) {
|
|
49778
|
+
this.#state = {
|
|
49779
|
+
...this.#state,
|
|
49780
|
+
notice: "Steering: interrupting the current turn\u2026",
|
|
49781
|
+
noticeLevel: "info"
|
|
49782
|
+
};
|
|
49783
|
+
}
|
|
49784
|
+
this.#state = queuing ? { ...this.#state, scrollOffset: 0 } : applyRuntimeEvent({ ...this.#state, scrollOffset: 0 }, {
|
|
49568
49785
|
type: "ai-status",
|
|
49569
49786
|
topicId: topic.id,
|
|
49570
49787
|
payload: { kind: "ai_active", queryId: optimisticQueryId }
|
|
49571
49788
|
});
|
|
49572
49789
|
this.#queueRender();
|
|
49573
49790
|
try {
|
|
49574
|
-
const message2 = await this.#client.sendMessage(topic, stripResolvedPathTriggers(text3)
|
|
49791
|
+
const message2 = await this.#client.sendMessage(topic, stripResolvedPathTriggers(text3), {
|
|
49792
|
+
steer
|
|
49793
|
+
});
|
|
49575
49794
|
this.#state = upsertMessage(this.#state, message2);
|
|
49795
|
+
const stillBehind = this.#state.activity[topic.id]?.running === true && this.#state.activity[topic.id]?.queryId === runningQueryId;
|
|
49796
|
+
if (queuing && stillBehind) {
|
|
49797
|
+
this.#state = queueMessage(this.#state, topic.id, { id: message2.id, text: displayText });
|
|
49798
|
+
}
|
|
49576
49799
|
} catch (error2) {
|
|
49577
49800
|
if (this.#state.activity[topic.id]?.queryId === optimisticQueryId) {
|
|
49578
49801
|
this.#state = applyRuntimeEvent(this.#state, {
|
|
@@ -49593,6 +49816,34 @@ class TerminalApp {
|
|
|
49593
49816
|
}
|
|
49594
49817
|
this.#queueRender();
|
|
49595
49818
|
}
|
|
49819
|
+
async#steerQueued() {
|
|
49820
|
+
const topic = activeTopic(this.#state);
|
|
49821
|
+
if (!topic || (this.#state.queued[topic.id] ?? []).length === 0)
|
|
49822
|
+
return;
|
|
49823
|
+
this.#state = {
|
|
49824
|
+
...this.#state,
|
|
49825
|
+
notice: "Steering: running the queued messages now\u2026",
|
|
49826
|
+
noticeLevel: "info"
|
|
49827
|
+
};
|
|
49828
|
+
this.#queueRender();
|
|
49829
|
+
try {
|
|
49830
|
+
const steered = await this.#client.steerQueued?.(topic.id);
|
|
49831
|
+
if (steered === false) {
|
|
49832
|
+
this.#state = {
|
|
49833
|
+
...this.#state,
|
|
49834
|
+
notice: "Nothing to steer: the queued messages already started.",
|
|
49835
|
+
noticeLevel: "info"
|
|
49836
|
+
};
|
|
49837
|
+
}
|
|
49838
|
+
} catch (error2) {
|
|
49839
|
+
this.#state = {
|
|
49840
|
+
...this.#state,
|
|
49841
|
+
notice: error2 instanceof Error ? error2.message : String(error2),
|
|
49842
|
+
noticeLevel: "error"
|
|
49843
|
+
};
|
|
49844
|
+
}
|
|
49845
|
+
this.#queueRender();
|
|
49846
|
+
}
|
|
49596
49847
|
async#runCommand(commandLine) {
|
|
49597
49848
|
const app = this;
|
|
49598
49849
|
await runTerminalCommand(commandLine, {
|
|
@@ -50626,11 +50877,45 @@ class TerminalApp {
|
|
|
50626
50877
|
}
|
|
50627
50878
|
this.#queueRender();
|
|
50628
50879
|
}
|
|
50880
|
+
async#answerAsk(ask) {
|
|
50881
|
+
const choices = ask.askUserQuestion?.choices ?? [];
|
|
50882
|
+
const typed = this.#collapsedPastes.expand(this.#input.text.trim()).trim();
|
|
50883
|
+
const index = Math.min(this.#state.askChoiceIndex, askRowCount(choices.length) - 1);
|
|
50884
|
+
let result;
|
|
50885
|
+
if (typed) {
|
|
50886
|
+
result = await this.#client.answerQuestion(ask.topicId, ask.id, typed, { kind: "custom" });
|
|
50887
|
+
if (result.ok) {
|
|
50888
|
+
this.#input.setText("");
|
|
50889
|
+
this.#collapsedPastes.clear();
|
|
50890
|
+
this.#syncInput();
|
|
50891
|
+
}
|
|
50892
|
+
} else if (index < choices.length) {
|
|
50893
|
+
result = await this.#client.answerQuestion(ask.topicId, ask.id, choices[index].label);
|
|
50894
|
+
} else if (index === choices.length) {
|
|
50895
|
+
this.#state = {
|
|
50896
|
+
...this.#state,
|
|
50897
|
+
notice: "Type your answer below, then press Enter.",
|
|
50898
|
+
noticeLevel: "info"
|
|
50899
|
+
};
|
|
50900
|
+
this.#queueRender();
|
|
50901
|
+
return;
|
|
50902
|
+
} else {
|
|
50903
|
+
result = await this.#client.answerQuestion(ask.topicId, ask.id, "", { kind: "skip" });
|
|
50904
|
+
}
|
|
50905
|
+
this.#state = {
|
|
50906
|
+
...this.#state,
|
|
50907
|
+
askChoiceIndex: 0,
|
|
50908
|
+
notice: result.ok ? undefined : result.error,
|
|
50909
|
+
noticeLevel: result.ok ? undefined : "error"
|
|
50910
|
+
};
|
|
50911
|
+
this.#queueRender();
|
|
50912
|
+
}
|
|
50629
50913
|
#moveAskChoice(delta) {
|
|
50630
50914
|
const choices = activeQuestion(this.#state)?.askUserQuestion?.choices;
|
|
50631
50915
|
if (!choices?.length)
|
|
50632
50916
|
return;
|
|
50633
|
-
const
|
|
50917
|
+
const rows = askRowCount(choices.length);
|
|
50918
|
+
const next = (this.#state.askChoiceIndex + delta + rows) % rows;
|
|
50634
50919
|
this.#state = { ...this.#state, askChoiceIndex: next };
|
|
50635
50920
|
this.#queueRender();
|
|
50636
50921
|
}
|
|
@@ -51998,7 +52283,7 @@ function renderOutbound(text3, maxLen = 4096) {
|
|
|
51998
52283
|
}
|
|
51999
52284
|
|
|
52000
52285
|
// ../../adapters/telegram/src/adapter.ts
|
|
52001
|
-
import { randomUUID as
|
|
52286
|
+
import { randomUUID as randomUUID34 } from "crypto";
|
|
52002
52287
|
import { existsSync as existsSync40 } from "fs";
|
|
52003
52288
|
import { basename as basename14, extname as extname6 } from "path";
|
|
52004
52289
|
function telegramGroupScope(chatId) {
|
|
@@ -52012,7 +52297,7 @@ function telegramGroupIdFromScope(scope) {
|
|
|
52012
52297
|
}
|
|
52013
52298
|
function telegramClientMessageId(msg, chatId, threadId) {
|
|
52014
52299
|
const messageId = msg?.message_id;
|
|
52015
|
-
const source = msg?.media_group_id ? Number.isSafeInteger(messageId) ? `album:${msg.media_group_id}:${messageId}` : `album:${msg.media_group_id}:legacy:${
|
|
52300
|
+
const source = msg?.media_group_id ? Number.isSafeInteger(messageId) ? `album:${msg.media_group_id}:${messageId}` : `album:${msg.media_group_id}:legacy:${randomUUID34()}` : Number.isSafeInteger(messageId) ? `message:${messageId}` : `legacy:${randomUUID34()}`;
|
|
52016
52301
|
return `telegram:${chatId}:${threadId ?? "main"}:${source}`;
|
|
52017
52302
|
}
|
|
52018
52303
|
function telegramActorLabel(msg) {
|
|
@@ -54043,7 +54328,7 @@ var init_protocol = __esm(() => {
|
|
|
54043
54328
|
});
|
|
54044
54329
|
|
|
54045
54330
|
// ../../adapters/otium/src/canonical-mcp-bridge.ts
|
|
54046
|
-
import { randomUUID as
|
|
54331
|
+
import { randomUUID as randomUUID35 } from "crypto";
|
|
54047
54332
|
function readAuthorization(request) {
|
|
54048
54333
|
const value = request.headers.get("authorization");
|
|
54049
54334
|
return value?.startsWith("Bearer ") ? value.slice(7) : null;
|
|
@@ -54184,7 +54469,7 @@ function startCanonicalMcpBridge(options = {}) {
|
|
|
54184
54469
|
const url = `http://127.0.0.1:${server.port}/`;
|
|
54185
54470
|
const unregister = registerCanonicalMcpBridgeEnvProvider((scope) => {
|
|
54186
54471
|
sweep();
|
|
54187
|
-
const token = `${
|
|
54472
|
+
const token = `${randomUUID35()}${randomUUID35()}`;
|
|
54188
54473
|
capabilities.set(token, {
|
|
54189
54474
|
surface: scope.surface,
|
|
54190
54475
|
userId: scope.userId,
|
|
@@ -54299,7 +54584,7 @@ __export(exports_join, {
|
|
|
54299
54584
|
joinCredentialDigest: () => joinCredentialDigest,
|
|
54300
54585
|
isJoinPersisted: () => isJoinPersisted
|
|
54301
54586
|
});
|
|
54302
|
-
import { createHash as createHash17, randomUUID as
|
|
54587
|
+
import { createHash as createHash17, randomUUID as randomUUID36 } from "crypto";
|
|
54303
54588
|
import {
|
|
54304
54589
|
chmodSync as chmodSync7,
|
|
54305
54590
|
closeSync as closeSync5,
|
|
@@ -54388,7 +54673,7 @@ function processIsAlive(pid) {
|
|
|
54388
54673
|
function withJoinCredentialLock(operation) {
|
|
54389
54674
|
const lockPath = joinLockPath();
|
|
54390
54675
|
const ownerPath = resolve26(lockPath, "owner.json");
|
|
54391
|
-
const owner = { pid: process.pid, token:
|
|
54676
|
+
const owner = { pid: process.pid, token: randomUUID36() };
|
|
54392
54677
|
mkdirSync34(dirname24(lockPath), { recursive: true });
|
|
54393
54678
|
for (let attempt = 0;; attempt += 1) {
|
|
54394
54679
|
let created = false;
|
|
@@ -54429,7 +54714,7 @@ function withJoinCredentialLock(operation) {
|
|
|
54429
54714
|
if (attempt > 0) {
|
|
54430
54715
|
throw new Error(`could not recover stale Otium join credential lock at ${lockPath}`);
|
|
54431
54716
|
}
|
|
54432
|
-
const stalePath = `${lockPath}.stale.${process.pid}.${
|
|
54717
|
+
const stalePath = `${lockPath}.stale.${process.pid}.${randomUUID36()}`;
|
|
54433
54718
|
try {
|
|
54434
54719
|
renameSync17(lockPath, stalePath);
|
|
54435
54720
|
rmSync11(stalePath, { recursive: true, force: true });
|
|
@@ -54506,7 +54791,7 @@ function fsyncPath(target) {
|
|
|
54506
54791
|
function writeJoins(joins, allowOverwrite) {
|
|
54507
54792
|
const path = joinFilePath();
|
|
54508
54793
|
const directory = dirname24(path);
|
|
54509
|
-
const temporaryPath = resolve26(directory, `.otium-join.json.${process.pid}.${
|
|
54794
|
+
const temporaryPath = resolve26(directory, `.otium-join.json.${process.pid}.${randomUUID36()}.tmp`);
|
|
54510
54795
|
const payload = { v: JOIN_FILE_VERSION, joins };
|
|
54511
54796
|
let fd;
|
|
54512
54797
|
try {
|
|
@@ -54631,7 +54916,7 @@ var init_join = __esm(async () => {
|
|
|
54631
54916
|
});
|
|
54632
54917
|
|
|
54633
54918
|
// ../../adapters/otium/src/peer-files.ts
|
|
54634
|
-
import { randomUUID as
|
|
54919
|
+
import { randomUUID as randomUUID37 } from "crypto";
|
|
54635
54920
|
import { copyFileSync as copyFileSync5, mkdirSync as mkdirSync35, rmSync as rmSync12, statSync as statSync21 } from "fs";
|
|
54636
54921
|
import { basename as basename15, extname as extname7, join as join49 } from "path";
|
|
54637
54922
|
function fileType(mimeType) {
|
|
@@ -54697,7 +54982,7 @@ function recordFile(args) {
|
|
|
54697
54982
|
});
|
|
54698
54983
|
}
|
|
54699
54984
|
function insertLocalFile(args) {
|
|
54700
|
-
const id =
|
|
54985
|
+
const id = randomUUID37();
|
|
54701
54986
|
mkdirSync35(PEER_FILES_DIR, { recursive: true });
|
|
54702
54987
|
const path = join49(PEER_FILES_DIR, `${id}-${safeFilename(args.filename)}`);
|
|
54703
54988
|
copyFileSync5(args.sourcePath, path);
|
|
@@ -54761,7 +55046,7 @@ var init_peer_files = __esm(async () => {
|
|
|
54761
55046
|
});
|
|
54762
55047
|
|
|
54763
55048
|
// ../../adapters/otium/src/runtime-bridge.ts
|
|
54764
|
-
import { randomUUID as
|
|
55049
|
+
import { randomUUID as randomUUID38 } from "crypto";
|
|
54765
55050
|
function isMcpToolResult(value) {
|
|
54766
55051
|
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
54767
55052
|
return false;
|
|
@@ -54825,7 +55110,7 @@ var init_runtime_bridge = __esm(async () => {
|
|
|
54825
55110
|
} catch (error2) {
|
|
54826
55111
|
return errorResult(`Error: Failed to open hub question: ${error2.message}`);
|
|
54827
55112
|
}
|
|
54828
|
-
const bridgeRequestId = `bridge-ask-${
|
|
55113
|
+
const bridgeRequestId = `bridge-ask-${randomUUID38()}`;
|
|
54829
55114
|
const baseUrl = hubNode.baseUrl.replace(/\/+$/, "");
|
|
54830
55115
|
const post = async (path, body) => {
|
|
54831
55116
|
const response = await fetch(`${baseUrl}${path}`, {
|
|
@@ -56320,7 +56605,7 @@ import {
|
|
|
56320
56605
|
diffieHellman,
|
|
56321
56606
|
generateKeyPairSync,
|
|
56322
56607
|
hkdfSync,
|
|
56323
|
-
randomUUID as
|
|
56608
|
+
randomUUID as randomUUID39
|
|
56324
56609
|
} from "crypto";
|
|
56325
56610
|
import {
|
|
56326
56611
|
chmodSync as chmodSync8,
|
|
@@ -56393,13 +56678,13 @@ function loadOrCreatePending(invite, nodeName) {
|
|
|
56393
56678
|
const pair = generateKeyPairSync("x25519");
|
|
56394
56679
|
const pending2 = {
|
|
56395
56680
|
...invite,
|
|
56396
|
-
idempotencyKey:
|
|
56681
|
+
idempotencyKey: randomUUID39(),
|
|
56397
56682
|
privateKey: pair.privateKey.export({ format: "der", type: "pkcs8" }).toString("base64url"),
|
|
56398
56683
|
publicKey: pair.publicKey.export({ format: "der", type: "spki" }).toString("base64url"),
|
|
56399
56684
|
...nodeName ? { nodeName } : {}
|
|
56400
56685
|
};
|
|
56401
56686
|
mkdirSync37(dirname26(path), { recursive: true });
|
|
56402
|
-
const temporaryPath = resolve28(dirname26(path), `.otium-enrollment-pending.json.${process.pid}.${
|
|
56687
|
+
const temporaryPath = resolve28(dirname26(path), `.otium-enrollment-pending.json.${process.pid}.${randomUUID39()}.tmp`);
|
|
56403
56688
|
let fd;
|
|
56404
56689
|
try {
|
|
56405
56690
|
fd = openSync6(temporaryPath, "wx", 384);
|
|
@@ -56429,7 +56714,7 @@ function loadOrCreatePending(invite, nodeName) {
|
|
|
56429
56714
|
function replacePendingEnrollment(pending2) {
|
|
56430
56715
|
const path = pendingEnrollmentPath();
|
|
56431
56716
|
const directory = dirname26(path);
|
|
56432
|
-
const temporaryPath = resolve28(directory, `.otium-enrollment-pending.json.${process.pid}.${
|
|
56717
|
+
const temporaryPath = resolve28(directory, `.otium-enrollment-pending.json.${process.pid}.${randomUUID39()}.tmp`);
|
|
56433
56718
|
let fd;
|
|
56434
56719
|
try {
|
|
56435
56720
|
fd = openSync6(temporaryPath, "wx", 384);
|
|
@@ -60909,4 +61194,4 @@ switch (command) {
|
|
|
60909
61194
|
}
|
|
60910
61195
|
}
|
|
60911
61196
|
|
|
60912
|
-
//# debugId=
|
|
61197
|
+
//# debugId=9DF88694EA59FD9264756E2164756E21
|