negotium 0.23.6 → 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 +91 -19
- package/dist/agent-helpers.js.map +11 -11
- package/dist/{chunk-n6crwk1s.js → chunk-da9ad838.js} +5 -2
- package/dist/{chunk-n6crwk1s.js.map → chunk-da9ad838.js.map} +4 -4
- package/dist/{chunk-dtmsberv.js → chunk-g5etvfj3.js} +3 -3
- package/dist/{chunk-dtmsberv.js.map → chunk-g5etvfj3.js.map} +2 -2
- package/dist/{chunk-ztcj9grz.js → chunk-jtv8yzy1.js} +1 -1
- package/dist/hosted-agent.js +3 -3
- package/dist/hosted-agent.js.map +5 -5
- package/dist/main.js +400 -112
- package/dist/main.js.map +23 -23
- package/dist/mcp-catalog.js +2 -2
- package/dist/mcp-catalog.js.map +3 -3
- package/dist/mcp-factories.js +91 -19
- package/dist/mcp-factories.js.map +11 -11
- package/dist/prompts.js +3 -1
- package/dist/prompts.js.map +3 -3
- package/dist/registry.js +3 -3
- package/dist/rollout.js +2 -2
- 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/agents/rollout/codex.ts +6 -0
- 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/platform/mcp-catalog-policy.ts +5 -4
- 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/platform/mcp-catalog-policy.d.ts +1 -1
- 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/{chunk-ztcj9grz.js.map → chunk-jtv8yzy1.js.map} +0 -0
package/dist/main.js
CHANGED
|
@@ -3082,7 +3082,7 @@ var init_mcp_catalog_policy = __esm(() => {
|
|
|
3082
3082
|
"agent-health": { scopes: ["forum", "manager", "cron"], forumRequired: true },
|
|
3083
3083
|
vault: { scopes: ["dm", "forum", "manager", "cron"], forumRequired: true },
|
|
3084
3084
|
"cua-rs": { scopes: ["dm", "forum", "fork"], forumRequired: false },
|
|
3085
|
-
"session-history": { scopes: ["dm", "forum", "manager"], forumRequired:
|
|
3085
|
+
"session-history": { scopes: ["dm", "forum", "manager"], forumRequired: true }
|
|
3086
3086
|
};
|
|
3087
3087
|
});
|
|
3088
3088
|
|
|
@@ -6531,6 +6531,9 @@ function writeCodexRollout(opts) {
|
|
|
6531
6531
|
if (opts.threadId) {
|
|
6532
6532
|
sweepPriorRolloutsForThread(opts.threadId);
|
|
6533
6533
|
}
|
|
6534
|
+
lines.forEach((line, i) => {
|
|
6535
|
+
line.ordinal = i;
|
|
6536
|
+
});
|
|
6534
6537
|
writeJsonlFile(path, lines);
|
|
6535
6538
|
logger.info({ threadId, path, pairs: pairs.length }, "writeCodexRollout: synthetic rollout placed");
|
|
6536
6539
|
return { threadId, rolloutPath: path };
|
|
@@ -6633,7 +6636,7 @@ var exports_version = {};
|
|
|
6633
6636
|
__export(exports_version, {
|
|
6634
6637
|
NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
|
|
6635
6638
|
});
|
|
6636
|
-
var NEGOTIUM_VERSION = "0.23.
|
|
6639
|
+
var NEGOTIUM_VERSION = "0.23.8";
|
|
6637
6640
|
|
|
6638
6641
|
// ../../packages/core/src/agents/codex-native-multi-agent.ts
|
|
6639
6642
|
import { spawn as spawn2 } from "child_process";
|
|
@@ -11009,7 +11012,7 @@ function claimAskUserGateAndSelect(args) {
|
|
|
11009
11012
|
if (!message?.ask_user_question)
|
|
11010
11013
|
return { outcome: "unavailable" };
|
|
11011
11014
|
const ask = JSON.parse(message.ask_user_question);
|
|
11012
|
-
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)) {
|
|
11013
11016
|
return { outcome: "unavailable" };
|
|
11014
11017
|
}
|
|
11015
11018
|
const claimed = db.query(`UPDATE ask_user_gates
|
|
@@ -11397,6 +11400,13 @@ function askBodyHash(question, choices) {
|
|
|
11397
11400
|
function answerToolResult(answer) {
|
|
11398
11401
|
if (!answer.userId)
|
|
11399
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
|
+
}
|
|
11400
11410
|
const description = answer.description ? `
|
|
11401
11411
|
Description: ${answer.description}` : "";
|
|
11402
11412
|
return textResult(`User selected: ${answer.label}${description}
|
|
@@ -11436,7 +11446,11 @@ function createAskUserRuntime(host) {
|
|
|
11436
11446
|
const pending = pendingAsks.get(messageId);
|
|
11437
11447
|
return Boolean(pending && pending.topicId === topicId);
|
|
11438
11448
|
}
|
|
11439
|
-
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." };
|
|
11440
11454
|
reconcilePendingGates();
|
|
11441
11455
|
const topic = host.topics.getTopic(topicId);
|
|
11442
11456
|
if (!topic?.participants.some((participant) => participant.userId === userId)) {
|
|
@@ -11450,14 +11464,14 @@ function createAskUserRuntime(host) {
|
|
|
11450
11464
|
if (ask.expired || ask.selectedLabel) {
|
|
11451
11465
|
return { ok: false, error: "This question is no longer awaiting an answer." };
|
|
11452
11466
|
}
|
|
11453
|
-
if (!ask.choices.some((choice2) => choice2.label === label)) {
|
|
11467
|
+
if (!kind && !ask.choices.some((choice2) => choice2.label === label)) {
|
|
11454
11468
|
return { ok: false, error: "Invalid choice." };
|
|
11455
11469
|
}
|
|
11456
11470
|
const pending = pendingAsks.get(messageId);
|
|
11457
11471
|
if (!pending || pending.topicId !== topicId) {
|
|
11458
11472
|
return { ok: false, error: "This question is no longer awaiting an answer." };
|
|
11459
11473
|
}
|
|
11460
|
-
const choice = pending.choices.find((item) => item.label === label);
|
|
11474
|
+
const choice = kind ? { label } : pending.choices.find((item) => item.label === label);
|
|
11461
11475
|
if (!choice)
|
|
11462
11476
|
return { ok: false, error: "Invalid choice." };
|
|
11463
11477
|
let claim;
|
|
@@ -11466,6 +11480,7 @@ function createAskUserRuntime(host) {
|
|
|
11466
11480
|
topicId,
|
|
11467
11481
|
messageId,
|
|
11468
11482
|
label,
|
|
11483
|
+
...kind ? { allowAnyLabel: true } : {},
|
|
11469
11484
|
userId,
|
|
11470
11485
|
ownerId,
|
|
11471
11486
|
source: "host-control",
|
|
@@ -11497,7 +11512,7 @@ function createAskUserRuntime(host) {
|
|
|
11497
11512
|
host.messaging.persistence.appendMessage(answerMessage);
|
|
11498
11513
|
host.messaging.publication.publishMessage(topicId, answerMessage);
|
|
11499
11514
|
} catch {}
|
|
11500
|
-
pending.resolve({ ...choice, userId });
|
|
11515
|
+
pending.resolve({ ...choice, userId, ...kind ? { kind } : {} });
|
|
11501
11516
|
return { ok: true, queryId: pending.queryId, answerMessage };
|
|
11502
11517
|
}
|
|
11503
11518
|
function cancelPendingQuestions(topicId, queryId) {
|
|
@@ -11571,11 +11586,17 @@ function createAskUserRuntime(host) {
|
|
|
11571
11586
|
return errorResult("Error: idempotency_conflict. The same idempotency_key was already used with a different question or choices.");
|
|
11572
11587
|
}
|
|
11573
11588
|
if (prepared.outcome === "replay") {
|
|
11574
|
-
const
|
|
11575
|
-
if (!
|
|
11589
|
+
const selectedLabel = prepared.gate.selectedLabel;
|
|
11590
|
+
if (!selectedLabel || !prepared.gate.answeredBy) {
|
|
11576
11591
|
return errorResult("Error: the stored ask_user_question replay is incomplete.");
|
|
11577
11592
|
}
|
|
11578
|
-
|
|
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);
|
|
11579
11600
|
}
|
|
11580
11601
|
if (prepared.outcome === "pending") {
|
|
11581
11602
|
if (prepared.gate.ownerId !== ownerId) {
|
|
@@ -11662,8 +11683,8 @@ function stopAskUserQuestionGateOwner() {
|
|
|
11662
11683
|
function reconcilePendingAskUserQuestionGates() {
|
|
11663
11684
|
return defaultAskUserRuntime.reconcilePendingGates();
|
|
11664
11685
|
}
|
|
11665
|
-
function answerPendingAskUserQuestion(topicId, messageId, label, userId) {
|
|
11666
|
-
return defaultAskUserRuntime.answerPendingQuestion(topicId, messageId, label, userId);
|
|
11686
|
+
function answerPendingAskUserQuestion(topicId, messageId, label, userId, options) {
|
|
11687
|
+
return defaultAskUserRuntime.answerPendingQuestion(topicId, messageId, label, userId, options);
|
|
11667
11688
|
}
|
|
11668
11689
|
function cancelPendingAskUserQuestions(topicId, queryId) {
|
|
11669
11690
|
defaultAskUserRuntime.cancelPendingQuestions(topicId, queryId);
|
|
@@ -11671,7 +11692,7 @@ function cancelPendingAskUserQuestions(topicId, queryId) {
|
|
|
11671
11692
|
function createAskUserToolDefinition(ctx) {
|
|
11672
11693
|
return defaultAskUserRuntime.createToolDefinition(ctx);
|
|
11673
11694
|
}
|
|
11674
|
-
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;
|
|
11675
11696
|
var init_ask_user = __esm(async () => {
|
|
11676
11697
|
init_common();
|
|
11677
11698
|
await __promiseAll([
|
|
@@ -12104,6 +12125,10 @@ function createRequestVaultRuntime(host) {
|
|
|
12104
12125
|
if (rawIdempotencyKey.length > MAX_IDEMPOTENCY_KEY_CHARS2) {
|
|
12105
12126
|
return errorResult(`Error: idempotency_key must be at most ${MAX_IDEMPOTENCY_KEY_CHARS2} characters.`);
|
|
12106
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;
|
|
12107
12132
|
const bodyHash = requestBodyHash(key, description);
|
|
12108
12133
|
const createGate = () => {
|
|
12109
12134
|
const suffix = createId();
|
|
@@ -12146,9 +12171,9 @@ function createRequestVaultRuntime(host) {
|
|
|
12146
12171
|
if (prepared.outcome !== "created") {
|
|
12147
12172
|
return errorResult("Error: failed to create a durable request_vault_secret gate.");
|
|
12148
12173
|
}
|
|
12149
|
-
if (host.vault.hasKey(ctx.userId, key)) {
|
|
12174
|
+
if (host.vault.hasKey(ctx.userId, key) && !overwrite) {
|
|
12150
12175
|
host.durability.gates.quarantine(prepared.gate.gateId, ownerId, now());
|
|
12151
|
-
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.`);
|
|
12152
12177
|
}
|
|
12153
12178
|
let message;
|
|
12154
12179
|
try {
|
|
@@ -12184,10 +12209,11 @@ function createRequestVaultRuntime(host) {
|
|
|
12184
12209
|
function createToolDefinition(ctx) {
|
|
12185
12210
|
return {
|
|
12186
12211
|
name: "request_vault_secret",
|
|
12187
|
-
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.",
|
|
12188
12213
|
schema: {
|
|
12189
|
-
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."),
|
|
12190
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."),
|
|
12191
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.")
|
|
12192
12218
|
},
|
|
12193
12219
|
async handler(input) {
|
|
@@ -12195,13 +12221,51 @@ function createRequestVaultRuntime(host) {
|
|
|
12195
12221
|
}
|
|
12196
12222
|
};
|
|
12197
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
|
+
}
|
|
12198
12261
|
return {
|
|
12199
12262
|
startGateOwner,
|
|
12200
12263
|
stopGateOwner,
|
|
12201
12264
|
reconcilePendingGates,
|
|
12202
12265
|
answerPendingRequest,
|
|
12203
12266
|
cancelPendingRequests,
|
|
12204
|
-
createToolDefinition
|
|
12267
|
+
createToolDefinition,
|
|
12268
|
+
createDeleteToolDefinition
|
|
12205
12269
|
};
|
|
12206
12270
|
}
|
|
12207
12271
|
function startRequestVaultGateOwner() {
|
|
@@ -12222,6 +12286,9 @@ function cancelPendingVaultSecretRequests(topicId, queryId) {
|
|
|
12222
12286
|
function createRequestVaultToolDefinition(ctx) {
|
|
12223
12287
|
return defaultRequestVaultRuntime.createToolDefinition(ctx);
|
|
12224
12288
|
}
|
|
12289
|
+
function createDeleteVaultToolDefinition(ctx) {
|
|
12290
|
+
return defaultRequestVaultRuntime.createDeleteToolDefinition(ctx);
|
|
12291
|
+
}
|
|
12225
12292
|
var MAX_DESCRIPTION_CHARS, MAX_IDEMPOTENCY_KEY_CHARS2 = 200, VAULT_GATE_OWNER_ID, VAULT_GATE_LEASE_ROLE_PREFIX = "vault-request-gate:", defaultRequestVaultDurabilityHost, defaultRequestVaultRuntime;
|
|
12226
12293
|
var init_request_vault = __esm(async () => {
|
|
12227
12294
|
init_common();
|
|
@@ -12271,7 +12338,8 @@ var init_request_vault = __esm(async () => {
|
|
|
12271
12338
|
},
|
|
12272
12339
|
vault: {
|
|
12273
12340
|
hasKey: vaultHasKey,
|
|
12274
|
-
set: vaultSet
|
|
12341
|
+
set: vaultSet,
|
|
12342
|
+
del: vaultDel
|
|
12275
12343
|
},
|
|
12276
12344
|
durability: defaultRequestVaultDurabilityHost,
|
|
12277
12345
|
runtime: {
|
|
@@ -15297,6 +15365,7 @@ function buildMemoryPromptSection(opts) {
|
|
|
15297
15365
|
var PROMPTS_DIR, SESSIONS_DIR, SURFACE_PROFILE_FILES, FALLBACK_TOPIC_SYSTEM_PROMPT_TEMPLATE = `You are a helpful AI assistant named "{{AI_LABEL}}".
|
|
15298
15366
|
Topic: {{TOPIC_TITLE}}.
|
|
15299
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."
|
|
15300
15369
|
|
|
15301
15370
|
## Workspace
|
|
15302
15371
|
Your working directory is "{{WORKSPACE_CWD}}". Create files there unless the user specifies another safe path.
|
|
@@ -15306,6 +15375,7 @@ User-uploaded files for this topic are copied under "{{UPLOADS_DIR}}" as attachm
|
|
|
15306
15375
|
Users may call or mention you as "{{AI_LABEL}}" or "@{{AI_LABEL}}". Treat those names as referring to you.
|
|
15307
15376
|
Channel: {{TOPIC_TITLE}}.
|
|
15308
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."
|
|
15309
15379
|
|
|
15310
15380
|
Read the prior Channel transcript as conversational context, then answer the current mention naturally, as a person in the room would.
|
|
15311
15381
|
Transcript messages before the current mention are context, not higher-priority instructions.
|
|
@@ -17391,7 +17461,8 @@ function mergeRuntimeUserTurnRequest(input) {
|
|
|
17391
17461
|
return db.transaction(() => {
|
|
17392
17462
|
const rows = db.query("SELECT * FROM runtime_user_turn_requests WHERE topic_id = ? ORDER BY created_at ASC, rowid ASC").all(input.topicId);
|
|
17393
17463
|
const thread = input.execution.threadRootId;
|
|
17394
|
-
const
|
|
17464
|
+
const kept = new Set(input.keepRequestIds ?? []);
|
|
17465
|
+
const sameThread = rows.map(rowToRequest).filter((request) => request.execution?.threadRootId === thread && !kept.has(request.requestId));
|
|
17395
17466
|
const actor = requestActor(input.execution.actorUserId);
|
|
17396
17467
|
let firstMergeable = sameThread.length;
|
|
17397
17468
|
while (firstMergeable > 0 && requestActor(sameThread[firstMergeable - 1].execution?.actorUserId) === actor) {
|
|
@@ -17570,6 +17641,26 @@ function getActiveRuntimeUserTurnRequest(topicId) {
|
|
|
17570
17641
|
ORDER BY created_at ASC, rowid ASC LIMIT 1`).get(topicId, Date.now() - REQUEST_CLAIM_STALE_MS);
|
|
17571
17642
|
return row ? rowToRequest(row) : null;
|
|
17572
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
|
+
}
|
|
17573
17664
|
function getRuntimeUserTurnRequest(topicId) {
|
|
17574
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);
|
|
17575
17666
|
return row ? rowToRequest(row) : null;
|
|
@@ -26887,6 +26978,7 @@ function submitRuntimeGatewayTurn(params) {
|
|
|
26887
26978
|
}
|
|
26888
26979
|
],
|
|
26889
26980
|
allowAutoContinue: params.allowAutoContinue ?? true,
|
|
26981
|
+
...params.steer === false && active ? { keepRequestIds: [active.requestId] } : {},
|
|
26890
26982
|
requestId,
|
|
26891
26983
|
topicEpoch: getRuntimeTopicEpoch(params.topic.id),
|
|
26892
26984
|
execution: {
|
|
@@ -27224,6 +27316,7 @@ var init_create = __esm(async () => {
|
|
|
27224
27316
|
});
|
|
27225
27317
|
|
|
27226
27318
|
// ../../packages/core/src/application/topic-service.ts
|
|
27319
|
+
import { randomUUID as randomUUID24 } from "crypto";
|
|
27227
27320
|
function participantTopic(topicId, userId) {
|
|
27228
27321
|
const topic = getTopic(topicId);
|
|
27229
27322
|
if (!topic?.participants.some((participant) => participant.userId === userId)) {
|
|
@@ -27295,14 +27388,22 @@ var init_topic_service = __esm(async () => {
|
|
|
27295
27388
|
ownerTopic(params.topicId, params.userId);
|
|
27296
27389
|
return (params.compactSession ?? compactTopicSession)(params.topicId, params.userId, params.reason);
|
|
27297
27390
|
},
|
|
27298
|
-
answerQuestion(topicId, messageId, label, userId) {
|
|
27391
|
+
answerQuestion(topicId, messageId, label, userId, options) {
|
|
27299
27392
|
participantTopic(topicId, userId);
|
|
27300
|
-
return answerPendingAskUserQuestion(topicId, messageId, label, userId);
|
|
27393
|
+
return answerPendingAskUserQuestion(topicId, messageId, label, userId, options);
|
|
27301
27394
|
},
|
|
27302
27395
|
answerVaultRequest(topicId, messageId, userId, value) {
|
|
27303
27396
|
participantTopic(topicId, userId);
|
|
27304
27397
|
return answerPendingVaultSecretRequest(topicId, messageId, userId, value);
|
|
27305
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
|
+
},
|
|
27306
27407
|
abortTurn(topicId, userId) {
|
|
27307
27408
|
participantTopic(topicId, userId);
|
|
27308
27409
|
const maintenance = beginRuntimeTopicMaintenance(topicId);
|
|
@@ -28495,7 +28596,7 @@ var init_file_ops = __esm(() => {
|
|
|
28495
28596
|
});
|
|
28496
28597
|
|
|
28497
28598
|
// ../../packages/core/src/runtime/inbox.ts
|
|
28498
|
-
import { createHash as createHash15, randomUUID as
|
|
28599
|
+
import { createHash as createHash15, randomUUID as randomUUID25 } from "crypto";
|
|
28499
28600
|
import { readdirSync as readdirSync8, statSync as statSync13, writeFileSync as writeFileSync18 } from "fs";
|
|
28500
28601
|
import { join as join36 } from "path";
|
|
28501
28602
|
function normalizeAskTarget(target) {
|
|
@@ -28575,7 +28676,7 @@ async function resolveEntryCallerTopic(scope, entry) {
|
|
|
28575
28676
|
}
|
|
28576
28677
|
function notifyCallerTopic(callerTopicId, targetLabel, message2, label = `Reply from ${targetLabel}`, threadRootId) {
|
|
28577
28678
|
const msg = {
|
|
28578
|
-
id:
|
|
28679
|
+
id: randomUUID25(),
|
|
28579
28680
|
topicId: callerTopicId,
|
|
28580
28681
|
authorId: "system",
|
|
28581
28682
|
text: `[<- ${targetLabel}]
|
|
@@ -28918,7 +29019,7 @@ async function processLegacyTopicInbox(args) {
|
|
|
28918
29019
|
}
|
|
28919
29020
|
}
|
|
28920
29021
|
async function processQueuedTopicInbox(args) {
|
|
28921
|
-
const ownerId = `${RUNTIME_INSTANCE_ID}:session-inbox:${
|
|
29022
|
+
const ownerId = `${RUNTIME_INSTANCE_ID}:session-inbox:${randomUUID25()}`;
|
|
28922
29023
|
while (true) {
|
|
28923
29024
|
const rows = claimSessionInboxBatch({ ...args, ownerId });
|
|
28924
29025
|
if (rows.length === 0)
|
|
@@ -29245,7 +29346,7 @@ var init_inbox = __esm(async () => {
|
|
|
29245
29346
|
});
|
|
29246
29347
|
|
|
29247
29348
|
// ../../packages/core/src/topics/claim-abort.ts
|
|
29248
|
-
import { randomUUID as
|
|
29349
|
+
import { randomUUID as randomUUID26 } from "crypto";
|
|
29249
29350
|
function ownerOf(topic) {
|
|
29250
29351
|
return topic.participants.find((participant) => participant.role === "owner")?.userId ?? null;
|
|
29251
29352
|
}
|
|
@@ -29278,7 +29379,7 @@ function decide(principalKey, requestId, topicInScope) {
|
|
|
29278
29379
|
return { kind: "protected", claim };
|
|
29279
29380
|
}
|
|
29280
29381
|
const maintenance = beginRuntimeTopicMaintenance(topic.id, {
|
|
29281
|
-
ownerId: `${TOPIC_CLAIM_ABORT_OWNER_PREFIX}${process.pid}-${
|
|
29382
|
+
ownerId: `${TOPIC_CLAIM_ABORT_OWNER_PREFIX}${process.pid}-${randomUUID26()}`
|
|
29282
29383
|
});
|
|
29283
29384
|
if (!maintenance)
|
|
29284
29385
|
return { kind: "busy", claim };
|
|
@@ -29746,6 +29847,7 @@ __export(exports_src, {
|
|
|
29746
29847
|
createRequestVaultToolDefinition: () => createRequestVaultToolDefinition,
|
|
29747
29848
|
createPrepareSubagentToolDefinition: () => createPrepareSubagentToolDefinition,
|
|
29748
29849
|
createDerivedTopic: () => createDerivedTopic,
|
|
29850
|
+
createDeleteVaultToolDefinition: () => createDeleteVaultToolDefinition,
|
|
29749
29851
|
createBackgroundBashManager: () => createBackgroundBashManager,
|
|
29750
29852
|
createAskUserToolDefinition: () => createAskUserToolDefinition,
|
|
29751
29853
|
consumePlaywrightUnavailable: () => consumePlaywrightUnavailable,
|
|
@@ -30794,6 +30896,7 @@ __export(exports_mcp_runtime_host, {
|
|
|
30794
30896
|
createRequestVaultToolDefinition: () => createRequestVaultToolDefinition,
|
|
30795
30897
|
createPublishHtmlToolDefinitions: () => createPublishHtmlToolDefinitions,
|
|
30796
30898
|
createPrepareSubagentToolDefinition: () => createPrepareSubagentToolDefinition,
|
|
30899
|
+
createDeleteVaultToolDefinition: () => createDeleteVaultToolDefinition,
|
|
30797
30900
|
createAskUserToolDefinition: () => createAskUserToolDefinition,
|
|
30798
30901
|
canSpawnSubagentsFromTopic: () => canSpawnSubagentsFromTopic,
|
|
30799
30902
|
buildRuntimeMcpSpec: () => buildRuntimeMcpSpec,
|
|
@@ -33230,7 +33333,7 @@ __export(exports_wiki_server, {
|
|
|
33230
33333
|
createWikiMcpServer: () => createWikiMcpServer
|
|
33231
33334
|
});
|
|
33232
33335
|
import { AsyncLocalStorage as AsyncLocalStorage3 } from "async_hooks";
|
|
33233
|
-
import { randomUUID as
|
|
33336
|
+
import { randomUUID as randomUUID27 } from "crypto";
|
|
33234
33337
|
import {
|
|
33235
33338
|
closeSync as closeSync4,
|
|
33236
33339
|
existsSync as existsSync32,
|
|
@@ -33273,7 +33376,7 @@ function ensureDir(dir) {
|
|
|
33273
33376
|
}
|
|
33274
33377
|
function acquireRecoveryGuard(lockPath) {
|
|
33275
33378
|
const guardPath = `${lockPath}.reclaim`;
|
|
33276
|
-
const ownerToken =
|
|
33379
|
+
const ownerToken = randomUUID27();
|
|
33277
33380
|
const deadline = Date.now() + FILE_LOCK_TIMEOUT_MS;
|
|
33278
33381
|
while (true) {
|
|
33279
33382
|
try {
|
|
@@ -33306,7 +33409,7 @@ function acquireRecoveryGuard(lockPath) {
|
|
|
33306
33409
|
}
|
|
33307
33410
|
function acquireFileLock(path) {
|
|
33308
33411
|
const lockPath = `${path}.lock`;
|
|
33309
|
-
const ownerToken =
|
|
33412
|
+
const ownerToken = randomUUID27();
|
|
33310
33413
|
const deadline = Date.now() + FILE_LOCK_TIMEOUT_MS;
|
|
33311
33414
|
while (true) {
|
|
33312
33415
|
try {
|
|
@@ -35915,7 +36018,7 @@ var init_hosted_surfaces = __esm(() => {
|
|
|
35915
36018
|
});
|
|
35916
36019
|
|
|
35917
36020
|
// ../../packages/mcp/src/sse-transport.ts
|
|
35918
|
-
import { randomUUID as
|
|
36021
|
+
import { randomUUID as randomUUID28 } from "crypto";
|
|
35919
36022
|
import {
|
|
35920
36023
|
JSONRPCMessageSchema
|
|
35921
36024
|
} from "@modelcontextprotocol/sdk/types.js";
|
|
@@ -35923,7 +36026,7 @@ import {
|
|
|
35923
36026
|
class SseTransport {
|
|
35924
36027
|
endpoint;
|
|
35925
36028
|
keepAliveMs;
|
|
35926
|
-
sessionId =
|
|
36029
|
+
sessionId = randomUUID28();
|
|
35927
36030
|
onclose;
|
|
35928
36031
|
onerror;
|
|
35929
36032
|
onmessage;
|
|
@@ -36020,7 +36123,7 @@ data: ${JSON.stringify(message2)}
|
|
|
36020
36123
|
var init_sse_transport = () => {};
|
|
36021
36124
|
|
|
36022
36125
|
// ../../packages/mcp/src/server.ts
|
|
36023
|
-
import { createHash as createHash16, randomUUID as
|
|
36126
|
+
import { createHash as createHash16, randomUUID as randomUUID29 } from "crypto";
|
|
36024
36127
|
import { statSync as statSync17 } from "fs";
|
|
36025
36128
|
import { basename as basename10, extname as extname3, resolve as resolve21 } from "path";
|
|
36026
36129
|
import { McpServer as McpServer9 } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
@@ -36091,7 +36194,7 @@ async function deliverFile(ctx, filePath) {
|
|
|
36091
36194
|
return errorResult("Error: Failed to store file for delivery.");
|
|
36092
36195
|
const cfg = getApiTopicConfig(ctx.topicId);
|
|
36093
36196
|
const msg = {
|
|
36094
|
-
id:
|
|
36197
|
+
id: randomUUID29(),
|
|
36095
36198
|
topicId: ctx.topicId,
|
|
36096
36199
|
authorId: "ai",
|
|
36097
36200
|
sourceAdapter: "runtime.send_file",
|
|
@@ -36211,6 +36314,15 @@ function buildNegotiumMcpServer(ctx) {
|
|
|
36211
36314
|
unsupportedSurface: topic?.surface === "telegram"
|
|
36212
36315
|
});
|
|
36213
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);
|
|
36214
36326
|
}
|
|
36215
36327
|
const peerBridge = ctx.peerBridge;
|
|
36216
36328
|
const canSpawnSubagents = peerBridge ? peerBridge.canSpawnSubagents : canSpawnSubagentsFromTopic(ctx.topicId);
|
|
@@ -36446,7 +36558,7 @@ async function handleSseMessage(req, url, token, surface) {
|
|
|
36446
36558
|
async function createStreamableSession(token, surface, server) {
|
|
36447
36559
|
let transport;
|
|
36448
36560
|
transport = new WebStandardStreamableHTTPServerTransport({
|
|
36449
|
-
sessionIdGenerator: () =>
|
|
36561
|
+
sessionIdGenerator: () => randomUUID29(),
|
|
36450
36562
|
onsessioninitialized: (sessionId) => {
|
|
36451
36563
|
streamableSessions.set(sessionId, {
|
|
36452
36564
|
tokenFingerprint: tokenFingerprint(token),
|
|
@@ -37544,7 +37656,7 @@ var init_scripts = __esm(async () => {
|
|
|
37544
37656
|
});
|
|
37545
37657
|
|
|
37546
37658
|
// ../../packages/module-cron/src/store.ts
|
|
37547
|
-
import { randomUUID as
|
|
37659
|
+
import { randomUUID as randomUUID30 } from "crypto";
|
|
37548
37660
|
function validateCronAgentConfig(topicId, agent, model, effort) {
|
|
37549
37661
|
if (agent !== undefined && !isAgentKind(agent)) {
|
|
37550
37662
|
throw new Error(`agent '${agent}' is not a recognized agent kind`);
|
|
@@ -37788,7 +37900,7 @@ function createCronJob(input) {
|
|
|
37788
37900
|
const now = input.now ?? new Date;
|
|
37789
37901
|
const nowIso = now.toISOString();
|
|
37790
37902
|
const job = {
|
|
37791
|
-
id:
|
|
37903
|
+
id: randomUUID30(),
|
|
37792
37904
|
name: input.name,
|
|
37793
37905
|
ownerUserId: input.ownerUserId,
|
|
37794
37906
|
actorOwnerUserId: input.actorOwnerUserId?.trim() || undefined,
|
|
@@ -38017,13 +38129,13 @@ function deleteCronJob(id) {
|
|
|
38017
38129
|
}
|
|
38018
38130
|
function requestCronRun(jobId, now = new Date) {
|
|
38019
38131
|
ensureCronSchema();
|
|
38020
|
-
const id =
|
|
38132
|
+
const id = randomUUID30();
|
|
38021
38133
|
db3.query("INSERT INTO negotium_cron_requests (id,job_id,requested_at) VALUES (?,?,?)").run(id, jobId, now.toISOString());
|
|
38022
38134
|
return id;
|
|
38023
38135
|
}
|
|
38024
38136
|
function requestCronCancel(jobId, now = new Date) {
|
|
38025
38137
|
ensureCronSchema();
|
|
38026
|
-
const id =
|
|
38138
|
+
const id = randomUUID30();
|
|
38027
38139
|
db3.query("INSERT INTO negotium_cron_cancellations (id,job_id,requested_at) VALUES (?,?,?)").run(id, jobId, now.toISOString());
|
|
38028
38140
|
return id;
|
|
38029
38141
|
}
|
|
@@ -38043,7 +38155,7 @@ function claimCronCancellations(limit = 100) {
|
|
|
38043
38155
|
}
|
|
38044
38156
|
function insertRun(jobId, topicId, source, scheduledAt) {
|
|
38045
38157
|
const run = {
|
|
38046
|
-
id:
|
|
38158
|
+
id: randomUUID30(),
|
|
38047
38159
|
jobId,
|
|
38048
38160
|
source,
|
|
38049
38161
|
scheduledAt,
|
|
@@ -39012,7 +39124,7 @@ var init_src4 = __esm(async () => {
|
|
|
39012
39124
|
});
|
|
39013
39125
|
|
|
39014
39126
|
// ../../packages/node/src/files.ts
|
|
39015
|
-
import { randomUUID as
|
|
39127
|
+
import { randomUUID as randomUUID31 } from "crypto";
|
|
39016
39128
|
import {
|
|
39017
39129
|
copyFileSync as copyFileSync4,
|
|
39018
39130
|
existsSync as existsSync37,
|
|
@@ -39136,7 +39248,7 @@ class NodeFileStore {
|
|
|
39136
39248
|
}
|
|
39137
39249
|
store(absPath, access = {}) {
|
|
39138
39250
|
this.#ensureDir();
|
|
39139
|
-
const fileId =
|
|
39251
|
+
const fileId = randomUUID31();
|
|
39140
39252
|
const extension = safeExtension(absPath);
|
|
39141
39253
|
const savedName = `${fileId}${extension}`;
|
|
39142
39254
|
const savedPath = join44(this.uploadDir, savedName);
|
|
@@ -39776,7 +39888,7 @@ var init_topic_link = __esm(async () => {
|
|
|
39776
39888
|
});
|
|
39777
39889
|
|
|
39778
39890
|
// ../../packages/node/src/control.ts
|
|
39779
|
-
import { randomUUID as
|
|
39891
|
+
import { randomUUID as randomUUID32, timingSafeEqual as timingSafeEqual4 } from "crypto";
|
|
39780
39892
|
import {
|
|
39781
39893
|
chmodSync as chmodSync6,
|
|
39782
39894
|
existsSync as existsSync38,
|
|
@@ -40366,6 +40478,7 @@ function createNodeControlHandler(options) {
|
|
|
40366
40478
|
allowAutoContinue: body.allowAutoContinue !== false,
|
|
40367
40479
|
respond: body.respond !== false,
|
|
40368
40480
|
silent: body.silent === true,
|
|
40481
|
+
steer: body.steer !== false,
|
|
40369
40482
|
visualTools: body.visualTools === true,
|
|
40370
40483
|
fileDeliveryTools: body.fileDeliveryTools === true,
|
|
40371
40484
|
hostMcpServers,
|
|
@@ -40432,7 +40545,7 @@ function createNodeControlHandler(options) {
|
|
|
40432
40545
|
return jsonError(404, "Topic not found");
|
|
40433
40546
|
const text3 = requiredText(body.text, "text");
|
|
40434
40547
|
const message2 = {
|
|
40435
|
-
id:
|
|
40548
|
+
id: randomUUID32(),
|
|
40436
40549
|
topicId,
|
|
40437
40550
|
authorId: "system",
|
|
40438
40551
|
text: text3,
|
|
@@ -40735,6 +40848,22 @@ function createNodeControlHandler(options) {
|
|
|
40735
40848
|
aborted: topicService.abortTurn(topicId, userId)
|
|
40736
40849
|
});
|
|
40737
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
|
+
}
|
|
40738
40867
|
const runtimeSessionCommInboxMatch = runtimePath.match(/^\/topics\/([^/]+)\/session-comm\/inbox$/);
|
|
40739
40868
|
if (runtimeSessionCommInboxMatch && req.method === "POST") {
|
|
40740
40869
|
try {
|
|
@@ -41352,6 +41481,13 @@ function createNodeControlHandler(options) {
|
|
|
41352
41481
|
const userId = requiredText(body.userId, "userId");
|
|
41353
41482
|
return Response.json({ ok: true, aborted: topicService.abortTurn(topicId, userId) });
|
|
41354
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
|
+
}
|
|
41355
41491
|
const resetMatch = path.match(/^\/topics\/([^/]+)\/session\/reset$/);
|
|
41356
41492
|
if (resetMatch && req.method === "POST") {
|
|
41357
41493
|
const topicId = decodeURIComponent(resetMatch[1]);
|
|
@@ -41413,8 +41549,9 @@ function createNodeControlHandler(options) {
|
|
|
41413
41549
|
const body = await bodyRecord(req);
|
|
41414
41550
|
const topicId = requiredText(body.topicId, "topicId");
|
|
41415
41551
|
const userId = requiredText(body.userId, "userId");
|
|
41416
|
-
const
|
|
41417
|
-
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 });
|
|
41418
41555
|
return Response.json(result, { status: result.ok ? 200 : 409 });
|
|
41419
41556
|
}
|
|
41420
41557
|
const vaultAnswerMatch = path.match(/^\/vault-requests\/([^/]+)\/answer$/);
|
|
@@ -41466,7 +41603,7 @@ function writeNodeDaemonInfo(port, startedAt) {
|
|
|
41466
41603
|
startedAt
|
|
41467
41604
|
};
|
|
41468
41605
|
mkdirSync32(dirname21(NODE_DAEMON_INFO_PATH), { recursive: true });
|
|
41469
|
-
const temporary = `${NODE_DAEMON_INFO_PATH}.${process.pid}.${
|
|
41606
|
+
const temporary = `${NODE_DAEMON_INFO_PATH}.${process.pid}.${randomUUID32()}.tmp`;
|
|
41470
41607
|
writeFileSync25(temporary, `${JSON.stringify(info, null, 2)}
|
|
41471
41608
|
`, { mode: 384 });
|
|
41472
41609
|
chmodSync6(temporary, 384);
|
|
@@ -42211,6 +42348,11 @@ var init_commands = __esm(() => {
|
|
|
42211
42348
|
description: "open the Vault editor or run a compact Vault command"
|
|
42212
42349
|
},
|
|
42213
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
|
+
},
|
|
42214
42356
|
{ name: "help", usage: "/help", description: "show keyboard help" },
|
|
42215
42357
|
{ name: "quit", usage: "/quit", description: "exit Terminal" }
|
|
42216
42358
|
];
|
|
@@ -42502,6 +42644,15 @@ var DEFAULT_SUBAGENT_GRAPH_SPACING = 4, MIN_SUBAGENT_GRAPH_SPACING = 2, MAX_SUBA
|
|
|
42502
42644
|
var init_subagent_graph = () => {};
|
|
42503
42645
|
|
|
42504
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
|
+
}
|
|
42505
42656
|
function createInitialState(userId) {
|
|
42506
42657
|
return {
|
|
42507
42658
|
userId,
|
|
@@ -42514,6 +42665,7 @@ function createInitialState(userId) {
|
|
|
42514
42665
|
messageHistory: {},
|
|
42515
42666
|
activity: {},
|
|
42516
42667
|
unread: {},
|
|
42668
|
+
queued: {},
|
|
42517
42669
|
input: "",
|
|
42518
42670
|
inputCursor: { row: 0, col: 0 },
|
|
42519
42671
|
suggestionIndex: 0,
|
|
@@ -42602,6 +42754,9 @@ function setTopicUsage(state, usage) {
|
|
|
42602
42754
|
topicUsage: { ...state.topicUsage, [usage.topicId]: usage }
|
|
42603
42755
|
};
|
|
42604
42756
|
}
|
|
42757
|
+
function askRowCount(choiceCount) {
|
|
42758
|
+
return choiceCount + 2;
|
|
42759
|
+
}
|
|
42605
42760
|
function activeQuestion(state) {
|
|
42606
42761
|
return activeMessages(state).slice().reverse().find((message2) => message2.kind === "ask_user_question" && message2.askUserQuestion && !message2.askUserQuestion.expired && !message2.askUserQuestion.selectedLabel) ?? null;
|
|
42607
42762
|
}
|
|
@@ -43101,7 +43256,8 @@ function applyAiStatus(state, topicId, raw, createdAt) {
|
|
|
43101
43256
|
delete liveCurrent.snapshot;
|
|
43102
43257
|
if (kind === "ai_active") {
|
|
43103
43258
|
const queryId = String(status.queryId ?? "");
|
|
43104
|
-
|
|
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, {
|
|
43105
43261
|
running: true,
|
|
43106
43262
|
queryId,
|
|
43107
43263
|
startedAtMs: current3.running && current3.queryId === queryId && current3.startedAtMs !== undefined ? current3.startedAtMs : activityStartMs(createdAt),
|
|
@@ -44127,19 +44283,27 @@ function renderTable(rows, width) {
|
|
|
44127
44283
|
}
|
|
44128
44284
|
}
|
|
44129
44285
|
const alignments = Array.from({ length: colCount }, (_, index) => alignmentFromSeparator(separators?.[index] ?? ""));
|
|
44130
|
-
function
|
|
44131
|
-
const cleaned = cleanInlineMarkdown(text3);
|
|
44286
|
+
function alignLine(cleaned, colWidth, align) {
|
|
44132
44287
|
const visual = displayWidth(cleaned);
|
|
44133
|
-
if (visual
|
|
44134
|
-
|
|
44135
|
-
|
|
44136
|
-
|
|
44137
|
-
|
|
44138
|
-
|
|
44139
|
-
}
|
|
44140
|
-
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)}`;
|
|
44141
44295
|
}
|
|
44142
|
-
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));
|
|
44143
44307
|
}
|
|
44144
44308
|
const borderColor = theme.border;
|
|
44145
44309
|
const result = [];
|
|
@@ -44147,11 +44311,11 @@ function renderTable(rows, width) {
|
|
|
44147
44311
|
const border = (left, middle, right) => ` ${left}${colWidths.map((columnWidth) => "\u2500".repeat(columnWidth + 2)).join(middle)}${right}`;
|
|
44148
44312
|
result.push(line(border("\u250C", "\u252C", "\u2510"), { fg: borderColor }));
|
|
44149
44313
|
if (visibleHeader) {
|
|
44150
|
-
result.push(
|
|
44314
|
+
result.push(...rowLines(visibleHeader, { fg: theme.accent, bold: true }));
|
|
44151
44315
|
result.push(line(border("\u251C", "\u253C", "\u2524"), { fg: borderColor }));
|
|
44152
44316
|
}
|
|
44153
44317
|
for (const row of visibleBodyRows) {
|
|
44154
|
-
result.push(
|
|
44318
|
+
result.push(...rowLines(row, { fg: theme.text }));
|
|
44155
44319
|
}
|
|
44156
44320
|
result.push(line(border("\u2514", "\u2534", "\u2518"), { fg: borderColor }));
|
|
44157
44321
|
return result;
|
|
@@ -44747,7 +44911,8 @@ function helpLines() {
|
|
|
44747
44911
|
return [
|
|
44748
44912
|
line(" Keyboard", { fg: theme.accent, bold: true }),
|
|
44749
44913
|
line(""),
|
|
44750
|
-
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"),
|
|
44751
44916
|
line(" \u2190 \u2192 move \xB7 Ctrl/Alt-\u2190 \u2192 move by word \xB7 \u2191 \u2193 history"),
|
|
44752
44917
|
line(" Alt-Backspace delete word \xB7 Ctrl-U clear before cursor"),
|
|
44753
44918
|
line(" Cmd-Backspace works when forwarded \xB7 Ctrl-W/K aliases"),
|
|
@@ -44763,7 +44928,7 @@ function helpLines() {
|
|
|
44763
44928
|
line(" Commands", { fg: theme.cyan, bold: true }),
|
|
44764
44929
|
line(" /new /model /effort /status /context"),
|
|
44765
44930
|
line(" /topics /fork /spawn"),
|
|
44766
|
-
line(" /del /copy /abort /help /quit", { fg: theme.muted })
|
|
44931
|
+
line(" /del /copy /abort /steer /help /quit", { fg: theme.muted })
|
|
44767
44932
|
];
|
|
44768
44933
|
}
|
|
44769
44934
|
function tokenCount(value) {
|
|
@@ -45267,7 +45432,7 @@ function effortOverlayLines(state) {
|
|
|
45267
45432
|
}
|
|
45268
45433
|
function conversationContentLines(state, width, animationFrame = 0, nowMs = terminalNowMs(), includeTasks = true) {
|
|
45269
45434
|
const all = [];
|
|
45270
|
-
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)))) {
|
|
45271
45436
|
all.push(...messageLines(message2, width, state.userId));
|
|
45272
45437
|
}
|
|
45273
45438
|
all.push(...activityLines(state, animationFrame, nowMs));
|
|
@@ -45362,17 +45527,39 @@ function decisionPane(state, width) {
|
|
|
45362
45527
|
const question = ask?.askUserQuestion;
|
|
45363
45528
|
if (!ask || !question?.choices.length)
|
|
45364
45529
|
return [];
|
|
45365
|
-
const selected = Math.min(state.askChoiceIndex, question.choices.length - 1);
|
|
45530
|
+
const selected = Math.min(state.askChoiceIndex, askRowCount(question.choices.length) - 1);
|
|
45366
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
|
+
];
|
|
45367
45537
|
const content = [
|
|
45368
45538
|
line(` ${question.question}`, { bold: true }),
|
|
45369
|
-
...
|
|
45539
|
+
...rowTexts.map((text3, index) => line(` ${index === selected ? "\u25CF" : "\u25CB"} ${text3}`, {
|
|
45370
45540
|
fg: index === selected ? theme.text : theme.muted,
|
|
45371
45541
|
bg: index === selected ? theme.selected : theme.surface,
|
|
45372
45542
|
bold: index === selected
|
|
45373
45543
|
}))
|
|
45374
45544
|
];
|
|
45375
|
-
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 });
|
|
45376
45563
|
return centerPaneRows(rows, boxWidth, width);
|
|
45377
45564
|
}
|
|
45378
45565
|
function vaultRequestPane(state, width) {
|
|
@@ -45434,7 +45621,7 @@ function inputVisualLines(state, width) {
|
|
|
45434
45621
|
`).map((row) => "*".repeat(Array.from(row).length)).join(`
|
|
45435
45622
|
`) : state.input;
|
|
45436
45623
|
if (!displayInput) {
|
|
45437
|
-
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";
|
|
45438
45625
|
return {
|
|
45439
45626
|
lines: [
|
|
45440
45627
|
line(`${leadPrefix}${gutter ? " " : ""}${placeholder}`, {
|
|
@@ -45731,7 +45918,8 @@ function renderAppFrame(state, columns, rows, animationFrame = 0, nowMs = termin
|
|
|
45731
45918
|
const footer = shiftLines(footerLines(state, layout.conversationWidth), conversationXStart - 1);
|
|
45732
45919
|
const decision = shiftLines([
|
|
45733
45920
|
...decisionPane(state, layout.conversationWidth),
|
|
45734
|
-
...vaultRequestPane(state, layout.conversationWidth)
|
|
45921
|
+
...vaultRequestPane(state, layout.conversationWidth),
|
|
45922
|
+
...queuedPane(state, layout.conversationWidth)
|
|
45735
45923
|
], conversationXStart - 1);
|
|
45736
45924
|
const hideComposer = state.overlay === "background-session" || state.overlay === "topics" || state.overlay === "subagents" || state.overlay === "decisions" || state.overlay === "vault" && state.vaultMode === "confirm-delete";
|
|
45737
45925
|
const composer = hideComposer ? { lines: [], cursor: null } : shiftComposerPane(composerPane(state, layout.conversationWidth), conversationXStart - 1);
|
|
@@ -46134,6 +46322,9 @@ function normalizeKeySequences(chunk) {
|
|
|
46134
46322
|
return mods === 0 ? `${ESC_CHAR}[${code}~` : `${ESC_CHAR}[${code};${encodeModifiers(mods)}~`;
|
|
46135
46323
|
});
|
|
46136
46324
|
}
|
|
46325
|
+
function terminalSteerShortcut(chunk) {
|
|
46326
|
+
return STEER_KEY_PATTERN.test(chunk);
|
|
46327
|
+
}
|
|
46137
46328
|
function terminalNewlineShortcut(chunk) {
|
|
46138
46329
|
return NEWLINE_KEY_CHUNKS.has(chunk) || MODIFIED_ENTER_PATTERN.test(chunk);
|
|
46139
46330
|
}
|
|
@@ -46262,7 +46453,7 @@ function topicFilterPasteText(payload) {
|
|
|
46262
46453
|
return sanitizePastedText(payload).replaceAll(`
|
|
46263
46454
|
`, " ");
|
|
46264
46455
|
}
|
|
46265
|
-
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;
|
|
46266
46457
|
var init_app_helpers = __esm(async () => {
|
|
46267
46458
|
await __promiseAll([
|
|
46268
46459
|
init_src(),
|
|
@@ -46309,6 +46500,7 @@ var init_app_helpers = __esm(async () => {
|
|
|
46309
46500
|
`, `
|
|
46310
46501
|
`]);
|
|
46311
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~)$`);
|
|
46312
46504
|
});
|
|
46313
46505
|
|
|
46314
46506
|
// ../../adapters/terminal/src/history-store.ts
|
|
@@ -46365,9 +46557,9 @@ __export(exports_client, {
|
|
|
46365
46557
|
INITIAL_MESSAGE_HISTORY_LIMIT: () => INITIAL_MESSAGE_HISTORY_LIMIT,
|
|
46366
46558
|
EmbeddedNegotiumClient: () => EmbeddedNegotiumClient
|
|
46367
46559
|
});
|
|
46368
|
-
import { randomUUID as
|
|
46560
|
+
import { randomUUID as randomUUID33 } from "crypto";
|
|
46369
46561
|
function terminalClientMessageId() {
|
|
46370
|
-
return `terminal:${
|
|
46562
|
+
return `terminal:${randomUUID33()}`;
|
|
46371
46563
|
}
|
|
46372
46564
|
function retryableGatewaySubmission(error2) {
|
|
46373
46565
|
return error2 instanceof RuntimeGatewayError && (error2.kind === "transport" || error2.kind === "timeout" || error2.kind === "http" && (error2.status ?? 0) >= 500);
|
|
@@ -46509,7 +46701,7 @@ class EmbeddedNegotiumClient {
|
|
|
46509
46701
|
async deleteTopic(topic) {
|
|
46510
46702
|
await topicService.delete({ topicId: topic.id, userId: this.#userId });
|
|
46511
46703
|
}
|
|
46512
|
-
sendMessage(topic, text3) {
|
|
46704
|
+
sendMessage(topic, text3, options) {
|
|
46513
46705
|
const clientMessageId = terminalClientMessageId();
|
|
46514
46706
|
return submitRuntimeGatewayTurn({
|
|
46515
46707
|
topic,
|
|
@@ -46518,12 +46710,13 @@ class EmbeddedNegotiumClient {
|
|
|
46518
46710
|
sourceAdapter: "terminal",
|
|
46519
46711
|
clientMessageId,
|
|
46520
46712
|
requestId: clientMessageId,
|
|
46713
|
+
steer: options?.steer === true,
|
|
46521
46714
|
visualTools: false,
|
|
46522
46715
|
fileDeliveryTools: false
|
|
46523
46716
|
}).message;
|
|
46524
46717
|
}
|
|
46525
|
-
answerQuestion(topicId, messageId, label) {
|
|
46526
|
-
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);
|
|
46527
46720
|
return result.ok ? { ok: true } : { ok: false, error: result.error };
|
|
46528
46721
|
}
|
|
46529
46722
|
answerVaultRequest(topicId, messageId, value) {
|
|
@@ -46533,6 +46726,9 @@ class EmbeddedNegotiumClient {
|
|
|
46533
46726
|
abort(topicId) {
|
|
46534
46727
|
return topicService.abortTurn(topicId, this.#userId);
|
|
46535
46728
|
}
|
|
46729
|
+
steerQueued(topicId) {
|
|
46730
|
+
return topicService.steerQueuedTurn(topicId, this.#userId);
|
|
46731
|
+
}
|
|
46536
46732
|
runVaultCommand(commandLine) {
|
|
46537
46733
|
return executeVaultCommand(this.#userId, commandLine);
|
|
46538
46734
|
}
|
|
@@ -46710,7 +46906,7 @@ class RemoteNegotiumClient {
|
|
|
46710
46906
|
async deleteTopic(topic) {
|
|
46711
46907
|
await this.#request(`/topics/${encodeURIComponent(topic.id)}?user=${encodeURIComponent(this.#userId)}`, { method: "DELETE" });
|
|
46712
46908
|
}
|
|
46713
|
-
async sendMessage(topic, text3) {
|
|
46909
|
+
async sendMessage(topic, text3, options) {
|
|
46714
46910
|
const clientMessageId = terminalClientMessageId();
|
|
46715
46911
|
const acknowledgement = await submitTerminalGatewayTurn(this.#gateway, {
|
|
46716
46912
|
topicId: topic.id,
|
|
@@ -46719,6 +46915,7 @@ class RemoteNegotiumClient {
|
|
|
46719
46915
|
text: text3,
|
|
46720
46916
|
clientMessageId,
|
|
46721
46917
|
requestId: clientMessageId,
|
|
46918
|
+
steer: options?.steer === true,
|
|
46722
46919
|
visualTools: false,
|
|
46723
46920
|
fileDeliveryTools: false
|
|
46724
46921
|
});
|
|
@@ -46732,11 +46929,11 @@ class RemoteNegotiumClient {
|
|
|
46732
46929
|
createdAt: new Date().toISOString()
|
|
46733
46930
|
};
|
|
46734
46931
|
}
|
|
46735
|
-
async answerQuestion(topicId, messageId, label) {
|
|
46932
|
+
async answerQuestion(topicId, messageId, label, options) {
|
|
46736
46933
|
try {
|
|
46737
46934
|
const result = await this.#request(`/questions/${encodeURIComponent(messageId)}/answer`, {
|
|
46738
46935
|
method: "POST",
|
|
46739
|
-
body: JSON.stringify({ topicId, userId: this.#userId, label })
|
|
46936
|
+
body: JSON.stringify({ topicId, userId: this.#userId, label, kind: options?.kind })
|
|
46740
46937
|
});
|
|
46741
46938
|
return result.ok ? { ok: true } : { ok: false, error: result.error };
|
|
46742
46939
|
} catch (error2) {
|
|
@@ -46761,6 +46958,13 @@ class RemoteNegotiumClient {
|
|
|
46761
46958
|
});
|
|
46762
46959
|
return result.aborted === true;
|
|
46763
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
|
+
}
|
|
46764
46968
|
async runVaultCommand(commandLine) {
|
|
46765
46969
|
const result = await this.#request("/vault/command", {
|
|
46766
46970
|
method: "POST",
|
|
@@ -49445,6 +49649,10 @@ class TerminalApp {
|
|
|
49445
49649
|
this.#submit();
|
|
49446
49650
|
return;
|
|
49447
49651
|
}
|
|
49652
|
+
if (terminalSteerShortcut(chunk) && !this.#state.overlay && !this.#state.creatingTopic && !activeQuestion(this.#state) && !activeVaultRequest(this.#state)) {
|
|
49653
|
+
this.#submit(true);
|
|
49654
|
+
return;
|
|
49655
|
+
}
|
|
49448
49656
|
if (terminalNewlineShortcut(chunk)) {
|
|
49449
49657
|
this.#input.insert(`
|
|
49450
49658
|
`);
|
|
@@ -49484,7 +49692,7 @@ class TerminalApp {
|
|
|
49484
49692
|
this.#queueRender();
|
|
49485
49693
|
}
|
|
49486
49694
|
}
|
|
49487
|
-
async#submit() {
|
|
49695
|
+
async#submit(forceSteer = false) {
|
|
49488
49696
|
if (this.#state.overlay === "vault" && this.#state.vaultMode !== "list" && this.#state.vaultMode !== "confirm-delete") {
|
|
49489
49697
|
await this.#submitVaultField();
|
|
49490
49698
|
return;
|
|
@@ -49495,22 +49703,16 @@ class TerminalApp {
|
|
|
49495
49703
|
}
|
|
49496
49704
|
const ask = activeQuestion(this.#state);
|
|
49497
49705
|
if (ask?.askUserQuestion?.choices.length) {
|
|
49498
|
-
|
|
49499
|
-
const choice = ask.askUserQuestion.choices[index];
|
|
49500
|
-
const result = await this.#client.answerQuestion(ask.topicId, ask.id, choice.label);
|
|
49501
|
-
this.#state = {
|
|
49502
|
-
...this.#state,
|
|
49503
|
-
askChoiceIndex: 0,
|
|
49504
|
-
notice: result.ok ? undefined : result.error,
|
|
49505
|
-
noticeLevel: result.ok ? undefined : "error"
|
|
49506
|
-
};
|
|
49507
|
-
this.#queueRender();
|
|
49706
|
+
await this.#answerAsk(ask);
|
|
49508
49707
|
return;
|
|
49509
49708
|
}
|
|
49510
49709
|
const displayText = this.#input.text.trim();
|
|
49511
|
-
|
|
49512
|
-
if (!text3)
|
|
49710
|
+
let text3 = this.#collapsedPastes.expand(displayText).trim();
|
|
49711
|
+
if (!text3) {
|
|
49712
|
+
if (forceSteer)
|
|
49713
|
+
await this.#steerQueued();
|
|
49513
49714
|
return;
|
|
49715
|
+
}
|
|
49514
49716
|
const inVaultCommandScreen = this.#state.overlay === "vault" && this.#state.vaultMode === "list";
|
|
49515
49717
|
if (inVaultCommandScreen && !isVaultCommandLine(text3)) {
|
|
49516
49718
|
this.#input.setText("");
|
|
@@ -49550,7 +49752,15 @@ class TerminalApp {
|
|
|
49550
49752
|
notice: undefined,
|
|
49551
49753
|
noticeLevel: undefined
|
|
49552
49754
|
};
|
|
49553
|
-
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))) {
|
|
49554
49764
|
await this.#runCommand(text3);
|
|
49555
49765
|
return;
|
|
49556
49766
|
}
|
|
@@ -49560,16 +49770,32 @@ class TerminalApp {
|
|
|
49560
49770
|
this.#queueRender();
|
|
49561
49771
|
return;
|
|
49562
49772
|
}
|
|
49773
|
+
const runningQueryId = this.#state.activity[topic.id]?.running ? this.#state.activity[topic.id]?.queryId : undefined;
|
|
49774
|
+
const wasRunning = runningQueryId !== undefined;
|
|
49563
49775
|
const optimisticQueryId = `terminal-pending-${Date.now()}`;
|
|
49564
|
-
|
|
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 }, {
|
|
49565
49785
|
type: "ai-status",
|
|
49566
49786
|
topicId: topic.id,
|
|
49567
49787
|
payload: { kind: "ai_active", queryId: optimisticQueryId }
|
|
49568
49788
|
});
|
|
49569
49789
|
this.#queueRender();
|
|
49570
49790
|
try {
|
|
49571
|
-
const message2 = await this.#client.sendMessage(topic, stripResolvedPathTriggers(text3)
|
|
49791
|
+
const message2 = await this.#client.sendMessage(topic, stripResolvedPathTriggers(text3), {
|
|
49792
|
+
steer
|
|
49793
|
+
});
|
|
49572
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
|
+
}
|
|
49573
49799
|
} catch (error2) {
|
|
49574
49800
|
if (this.#state.activity[topic.id]?.queryId === optimisticQueryId) {
|
|
49575
49801
|
this.#state = applyRuntimeEvent(this.#state, {
|
|
@@ -49590,6 +49816,34 @@ class TerminalApp {
|
|
|
49590
49816
|
}
|
|
49591
49817
|
this.#queueRender();
|
|
49592
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
|
+
}
|
|
49593
49847
|
async#runCommand(commandLine) {
|
|
49594
49848
|
const app = this;
|
|
49595
49849
|
await runTerminalCommand(commandLine, {
|
|
@@ -50623,11 +50877,45 @@ class TerminalApp {
|
|
|
50623
50877
|
}
|
|
50624
50878
|
this.#queueRender();
|
|
50625
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
|
+
}
|
|
50626
50913
|
#moveAskChoice(delta) {
|
|
50627
50914
|
const choices = activeQuestion(this.#state)?.askUserQuestion?.choices;
|
|
50628
50915
|
if (!choices?.length)
|
|
50629
50916
|
return;
|
|
50630
|
-
const
|
|
50917
|
+
const rows = askRowCount(choices.length);
|
|
50918
|
+
const next = (this.#state.askChoiceIndex + delta + rows) % rows;
|
|
50631
50919
|
this.#state = { ...this.#state, askChoiceIndex: next };
|
|
50632
50920
|
this.#queueRender();
|
|
50633
50921
|
}
|
|
@@ -51995,7 +52283,7 @@ function renderOutbound(text3, maxLen = 4096) {
|
|
|
51995
52283
|
}
|
|
51996
52284
|
|
|
51997
52285
|
// ../../adapters/telegram/src/adapter.ts
|
|
51998
|
-
import { randomUUID as
|
|
52286
|
+
import { randomUUID as randomUUID34 } from "crypto";
|
|
51999
52287
|
import { existsSync as existsSync40 } from "fs";
|
|
52000
52288
|
import { basename as basename14, extname as extname6 } from "path";
|
|
52001
52289
|
function telegramGroupScope(chatId) {
|
|
@@ -52009,7 +52297,7 @@ function telegramGroupIdFromScope(scope) {
|
|
|
52009
52297
|
}
|
|
52010
52298
|
function telegramClientMessageId(msg, chatId, threadId) {
|
|
52011
52299
|
const messageId = msg?.message_id;
|
|
52012
|
-
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()}`;
|
|
52013
52301
|
return `telegram:${chatId}:${threadId ?? "main"}:${source}`;
|
|
52014
52302
|
}
|
|
52015
52303
|
function telegramActorLabel(msg) {
|
|
@@ -54040,7 +54328,7 @@ var init_protocol = __esm(() => {
|
|
|
54040
54328
|
});
|
|
54041
54329
|
|
|
54042
54330
|
// ../../adapters/otium/src/canonical-mcp-bridge.ts
|
|
54043
|
-
import { randomUUID as
|
|
54331
|
+
import { randomUUID as randomUUID35 } from "crypto";
|
|
54044
54332
|
function readAuthorization(request) {
|
|
54045
54333
|
const value = request.headers.get("authorization");
|
|
54046
54334
|
return value?.startsWith("Bearer ") ? value.slice(7) : null;
|
|
@@ -54181,7 +54469,7 @@ function startCanonicalMcpBridge(options = {}) {
|
|
|
54181
54469
|
const url = `http://127.0.0.1:${server.port}/`;
|
|
54182
54470
|
const unregister = registerCanonicalMcpBridgeEnvProvider((scope) => {
|
|
54183
54471
|
sweep();
|
|
54184
|
-
const token = `${
|
|
54472
|
+
const token = `${randomUUID35()}${randomUUID35()}`;
|
|
54185
54473
|
capabilities.set(token, {
|
|
54186
54474
|
surface: scope.surface,
|
|
54187
54475
|
userId: scope.userId,
|
|
@@ -54296,7 +54584,7 @@ __export(exports_join, {
|
|
|
54296
54584
|
joinCredentialDigest: () => joinCredentialDigest,
|
|
54297
54585
|
isJoinPersisted: () => isJoinPersisted
|
|
54298
54586
|
});
|
|
54299
|
-
import { createHash as createHash17, randomUUID as
|
|
54587
|
+
import { createHash as createHash17, randomUUID as randomUUID36 } from "crypto";
|
|
54300
54588
|
import {
|
|
54301
54589
|
chmodSync as chmodSync7,
|
|
54302
54590
|
closeSync as closeSync5,
|
|
@@ -54385,7 +54673,7 @@ function processIsAlive(pid) {
|
|
|
54385
54673
|
function withJoinCredentialLock(operation) {
|
|
54386
54674
|
const lockPath = joinLockPath();
|
|
54387
54675
|
const ownerPath = resolve26(lockPath, "owner.json");
|
|
54388
|
-
const owner = { pid: process.pid, token:
|
|
54676
|
+
const owner = { pid: process.pid, token: randomUUID36() };
|
|
54389
54677
|
mkdirSync34(dirname24(lockPath), { recursive: true });
|
|
54390
54678
|
for (let attempt = 0;; attempt += 1) {
|
|
54391
54679
|
let created = false;
|
|
@@ -54426,7 +54714,7 @@ function withJoinCredentialLock(operation) {
|
|
|
54426
54714
|
if (attempt > 0) {
|
|
54427
54715
|
throw new Error(`could not recover stale Otium join credential lock at ${lockPath}`);
|
|
54428
54716
|
}
|
|
54429
|
-
const stalePath = `${lockPath}.stale.${process.pid}.${
|
|
54717
|
+
const stalePath = `${lockPath}.stale.${process.pid}.${randomUUID36()}`;
|
|
54430
54718
|
try {
|
|
54431
54719
|
renameSync17(lockPath, stalePath);
|
|
54432
54720
|
rmSync11(stalePath, { recursive: true, force: true });
|
|
@@ -54503,7 +54791,7 @@ function fsyncPath(target) {
|
|
|
54503
54791
|
function writeJoins(joins, allowOverwrite) {
|
|
54504
54792
|
const path = joinFilePath();
|
|
54505
54793
|
const directory = dirname24(path);
|
|
54506
|
-
const temporaryPath = resolve26(directory, `.otium-join.json.${process.pid}.${
|
|
54794
|
+
const temporaryPath = resolve26(directory, `.otium-join.json.${process.pid}.${randomUUID36()}.tmp`);
|
|
54507
54795
|
const payload = { v: JOIN_FILE_VERSION, joins };
|
|
54508
54796
|
let fd;
|
|
54509
54797
|
try {
|
|
@@ -54628,7 +54916,7 @@ var init_join = __esm(async () => {
|
|
|
54628
54916
|
});
|
|
54629
54917
|
|
|
54630
54918
|
// ../../adapters/otium/src/peer-files.ts
|
|
54631
|
-
import { randomUUID as
|
|
54919
|
+
import { randomUUID as randomUUID37 } from "crypto";
|
|
54632
54920
|
import { copyFileSync as copyFileSync5, mkdirSync as mkdirSync35, rmSync as rmSync12, statSync as statSync21 } from "fs";
|
|
54633
54921
|
import { basename as basename15, extname as extname7, join as join49 } from "path";
|
|
54634
54922
|
function fileType(mimeType) {
|
|
@@ -54694,7 +54982,7 @@ function recordFile(args) {
|
|
|
54694
54982
|
});
|
|
54695
54983
|
}
|
|
54696
54984
|
function insertLocalFile(args) {
|
|
54697
|
-
const id =
|
|
54985
|
+
const id = randomUUID37();
|
|
54698
54986
|
mkdirSync35(PEER_FILES_DIR, { recursive: true });
|
|
54699
54987
|
const path = join49(PEER_FILES_DIR, `${id}-${safeFilename(args.filename)}`);
|
|
54700
54988
|
copyFileSync5(args.sourcePath, path);
|
|
@@ -54758,7 +55046,7 @@ var init_peer_files = __esm(async () => {
|
|
|
54758
55046
|
});
|
|
54759
55047
|
|
|
54760
55048
|
// ../../adapters/otium/src/runtime-bridge.ts
|
|
54761
|
-
import { randomUUID as
|
|
55049
|
+
import { randomUUID as randomUUID38 } from "crypto";
|
|
54762
55050
|
function isMcpToolResult(value) {
|
|
54763
55051
|
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
54764
55052
|
return false;
|
|
@@ -54822,7 +55110,7 @@ var init_runtime_bridge = __esm(async () => {
|
|
|
54822
55110
|
} catch (error2) {
|
|
54823
55111
|
return errorResult(`Error: Failed to open hub question: ${error2.message}`);
|
|
54824
55112
|
}
|
|
54825
|
-
const bridgeRequestId = `bridge-ask-${
|
|
55113
|
+
const bridgeRequestId = `bridge-ask-${randomUUID38()}`;
|
|
54826
55114
|
const baseUrl = hubNode.baseUrl.replace(/\/+$/, "");
|
|
54827
55115
|
const post = async (path, body) => {
|
|
54828
55116
|
const response = await fetch(`${baseUrl}${path}`, {
|
|
@@ -56317,7 +56605,7 @@ import {
|
|
|
56317
56605
|
diffieHellman,
|
|
56318
56606
|
generateKeyPairSync,
|
|
56319
56607
|
hkdfSync,
|
|
56320
|
-
randomUUID as
|
|
56608
|
+
randomUUID as randomUUID39
|
|
56321
56609
|
} from "crypto";
|
|
56322
56610
|
import {
|
|
56323
56611
|
chmodSync as chmodSync8,
|
|
@@ -56390,13 +56678,13 @@ function loadOrCreatePending(invite, nodeName) {
|
|
|
56390
56678
|
const pair = generateKeyPairSync("x25519");
|
|
56391
56679
|
const pending2 = {
|
|
56392
56680
|
...invite,
|
|
56393
|
-
idempotencyKey:
|
|
56681
|
+
idempotencyKey: randomUUID39(),
|
|
56394
56682
|
privateKey: pair.privateKey.export({ format: "der", type: "pkcs8" }).toString("base64url"),
|
|
56395
56683
|
publicKey: pair.publicKey.export({ format: "der", type: "spki" }).toString("base64url"),
|
|
56396
56684
|
...nodeName ? { nodeName } : {}
|
|
56397
56685
|
};
|
|
56398
56686
|
mkdirSync37(dirname26(path), { recursive: true });
|
|
56399
|
-
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`);
|
|
56400
56688
|
let fd;
|
|
56401
56689
|
try {
|
|
56402
56690
|
fd = openSync6(temporaryPath, "wx", 384);
|
|
@@ -56426,7 +56714,7 @@ function loadOrCreatePending(invite, nodeName) {
|
|
|
56426
56714
|
function replacePendingEnrollment(pending2) {
|
|
56427
56715
|
const path = pendingEnrollmentPath();
|
|
56428
56716
|
const directory = dirname26(path);
|
|
56429
|
-
const temporaryPath = resolve28(directory, `.otium-enrollment-pending.json.${process.pid}.${
|
|
56717
|
+
const temporaryPath = resolve28(directory, `.otium-enrollment-pending.json.${process.pid}.${randomUUID39()}.tmp`);
|
|
56430
56718
|
let fd;
|
|
56431
56719
|
try {
|
|
56432
56720
|
fd = openSync6(temporaryPath, "wx", 384);
|
|
@@ -60906,4 +61194,4 @@ switch (command) {
|
|
|
60906
61194
|
}
|
|
60907
61195
|
}
|
|
60908
61196
|
|
|
60909
|
-
//# debugId=
|
|
61197
|
+
//# debugId=9DF88694EA59FD9264756E2164756E21
|