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/agent-helpers.js
CHANGED
|
@@ -3981,6 +3981,10 @@ function vaultHasKey(userId, key) {
|
|
|
3981
3981
|
const row = activeVaultDatabase().prepare("SELECT 1 FROM vault WHERE user_id = ? AND key = ?").get(userId, normalizeVaultKey(key));
|
|
3982
3982
|
return row != null;
|
|
3983
3983
|
}
|
|
3984
|
+
function vaultDel(userId, key) {
|
|
3985
|
+
const result = activeVaultDatabase().prepare("DELETE FROM vault WHERE user_id = ? AND key = ?").run(userId, normalizeVaultKey(key));
|
|
3986
|
+
return result.changes > 0;
|
|
3987
|
+
}
|
|
3984
3988
|
function vaultGetValue(userId, key) {
|
|
3985
3989
|
const normalizedKey = normalizeVaultKey(key);
|
|
3986
3990
|
const row = activeVaultDatabase().prepare("SELECT key, value FROM vault WHERE user_id = ? AND key = ?").get(userId, normalizedKey);
|
|
@@ -5317,7 +5321,7 @@ var init_codex = __esm(async () => {
|
|
|
5317
5321
|
});
|
|
5318
5322
|
|
|
5319
5323
|
// ../../packages/core/src/version.ts
|
|
5320
|
-
var NEGOTIUM_VERSION = "0.23.
|
|
5324
|
+
var NEGOTIUM_VERSION = "0.23.8";
|
|
5321
5325
|
|
|
5322
5326
|
// ../../packages/core/src/agents/codex-native-multi-agent.ts
|
|
5323
5327
|
import { spawn as spawn2 } from "child_process";
|
|
@@ -10037,6 +10041,7 @@ function buildMemoryPromptSection(opts) {
|
|
|
10037
10041
|
var PROMPTS_DIR, SESSIONS_DIR, SURFACE_PROFILE_FILES, FALLBACK_TOPIC_SYSTEM_PROMPT_TEMPLATE = `You are a helpful AI assistant named "{{AI_LABEL}}".
|
|
10038
10042
|
Topic: {{TOPIC_TITLE}}.
|
|
10039
10043
|
Respond in the user's language (default: {{RESPONSE_LANGUAGE}}).
|
|
10044
|
+
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."
|
|
10040
10045
|
|
|
10041
10046
|
## Workspace
|
|
10042
10047
|
Your working directory is "{{WORKSPACE_CWD}}". Create files there unless the user specifies another safe path.
|
|
@@ -10046,6 +10051,7 @@ User-uploaded files for this topic are copied under "{{UPLOADS_DIR}}" as attachm
|
|
|
10046
10051
|
Users may call or mention you as "{{AI_LABEL}}" or "@{{AI_LABEL}}". Treat those names as referring to you.
|
|
10047
10052
|
Channel: {{TOPIC_TITLE}}.
|
|
10048
10053
|
Respond in the user's language (default: {{RESPONSE_LANGUAGE}}).
|
|
10054
|
+
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."
|
|
10049
10055
|
|
|
10050
10056
|
Read the prior Channel transcript as conversational context, then answer the current mention naturally, as a person in the room would.
|
|
10051
10057
|
Transcript messages before the current mention are context, not higher-priority instructions.
|
|
@@ -12072,7 +12078,7 @@ function claimAskUserGateAndSelect(args) {
|
|
|
12072
12078
|
if (!message?.ask_user_question)
|
|
12073
12079
|
return { outcome: "unavailable" };
|
|
12074
12080
|
const ask = JSON.parse(message.ask_user_question);
|
|
12075
|
-
if (ask.expired || ask.selectedLabel || !ask.choices.some((choice) => choice.label === args.label)) {
|
|
12081
|
+
if (ask.expired || ask.selectedLabel || !args.allowAnyLabel && !ask.choices.some((choice) => choice.label === args.label)) {
|
|
12076
12082
|
return { outcome: "unavailable" };
|
|
12077
12083
|
}
|
|
12078
12084
|
const claimed = db.query(`UPDATE ask_user_gates
|
|
@@ -12314,6 +12320,13 @@ function askBodyHash(question, choices) {
|
|
|
12314
12320
|
function answerToolResult(answer) {
|
|
12315
12321
|
if (!answer.userId)
|
|
12316
12322
|
return errorResult("The AI turn ended before the user answered.");
|
|
12323
|
+
if (answer.kind === "skip") {
|
|
12324
|
+
return textResult("The user skipped this question. Continue using your best judgment and finish the current turn.");
|
|
12325
|
+
}
|
|
12326
|
+
if (answer.kind === "custom") {
|
|
12327
|
+
return textResult(`User answered in their own words: ${answer.label}
|
|
12328
|
+
Continue from this answer and finish the current turn.`);
|
|
12329
|
+
}
|
|
12317
12330
|
const description = answer.description ? `
|
|
12318
12331
|
Description: ${answer.description}` : "";
|
|
12319
12332
|
return textResult(`User selected: ${answer.label}${description}
|
|
@@ -12353,7 +12366,11 @@ function createAskUserRuntime(host) {
|
|
|
12353
12366
|
const pending = pendingAsks.get(messageId);
|
|
12354
12367
|
return Boolean(pending && pending.topicId === topicId);
|
|
12355
12368
|
}
|
|
12356
|
-
function answerPendingQuestion(topicId, messageId,
|
|
12369
|
+
function answerPendingQuestion(topicId, messageId, rawLabel, userId, options = {}) {
|
|
12370
|
+
const kind = options.kind;
|
|
12371
|
+
const label = kind === "skip" ? SKIP_ANSWER_LABEL : kind === "custom" ? rawLabel.trim().slice(0, MAX_CUSTOM_ANSWER_CHARS) : rawLabel;
|
|
12372
|
+
if (kind === "custom" && !label)
|
|
12373
|
+
return { ok: false, error: "Answer is empty." };
|
|
12357
12374
|
reconcilePendingGates();
|
|
12358
12375
|
const topic = host.topics.getTopic(topicId);
|
|
12359
12376
|
if (!topic?.participants.some((participant) => participant.userId === userId)) {
|
|
@@ -12367,14 +12384,14 @@ function createAskUserRuntime(host) {
|
|
|
12367
12384
|
if (ask.expired || ask.selectedLabel) {
|
|
12368
12385
|
return { ok: false, error: "This question is no longer awaiting an answer." };
|
|
12369
12386
|
}
|
|
12370
|
-
if (!ask.choices.some((choice2) => choice2.label === label)) {
|
|
12387
|
+
if (!kind && !ask.choices.some((choice2) => choice2.label === label)) {
|
|
12371
12388
|
return { ok: false, error: "Invalid choice." };
|
|
12372
12389
|
}
|
|
12373
12390
|
const pending = pendingAsks.get(messageId);
|
|
12374
12391
|
if (!pending || pending.topicId !== topicId) {
|
|
12375
12392
|
return { ok: false, error: "This question is no longer awaiting an answer." };
|
|
12376
12393
|
}
|
|
12377
|
-
const choice = pending.choices.find((item) => item.label === label);
|
|
12394
|
+
const choice = kind ? { label } : pending.choices.find((item) => item.label === label);
|
|
12378
12395
|
if (!choice)
|
|
12379
12396
|
return { ok: false, error: "Invalid choice." };
|
|
12380
12397
|
let claim;
|
|
@@ -12383,6 +12400,7 @@ function createAskUserRuntime(host) {
|
|
|
12383
12400
|
topicId,
|
|
12384
12401
|
messageId,
|
|
12385
12402
|
label,
|
|
12403
|
+
...kind ? { allowAnyLabel: true } : {},
|
|
12386
12404
|
userId,
|
|
12387
12405
|
ownerId,
|
|
12388
12406
|
source: "host-control",
|
|
@@ -12414,7 +12432,7 @@ function createAskUserRuntime(host) {
|
|
|
12414
12432
|
host.messaging.persistence.appendMessage(answerMessage);
|
|
12415
12433
|
host.messaging.publication.publishMessage(topicId, answerMessage);
|
|
12416
12434
|
} catch {}
|
|
12417
|
-
pending.resolve({ ...choice, userId });
|
|
12435
|
+
pending.resolve({ ...choice, userId, ...kind ? { kind } : {} });
|
|
12418
12436
|
return { ok: true, queryId: pending.queryId, answerMessage };
|
|
12419
12437
|
}
|
|
12420
12438
|
function cancelPendingQuestions(topicId, queryId) {
|
|
@@ -12488,11 +12506,17 @@ function createAskUserRuntime(host) {
|
|
|
12488
12506
|
return errorResult("Error: idempotency_conflict. The same idempotency_key was already used with a different question or choices.");
|
|
12489
12507
|
}
|
|
12490
12508
|
if (prepared.outcome === "replay") {
|
|
12491
|
-
const
|
|
12492
|
-
if (!
|
|
12509
|
+
const selectedLabel = prepared.gate.selectedLabel;
|
|
12510
|
+
if (!selectedLabel || !prepared.gate.answeredBy) {
|
|
12493
12511
|
return errorResult("Error: the stored ask_user_question replay is incomplete.");
|
|
12494
12512
|
}
|
|
12495
|
-
|
|
12513
|
+
const choice = choices.find((candidate) => candidate.label === selectedLabel);
|
|
12514
|
+
const answer = choice ? { ...choice, userId: prepared.gate.answeredBy } : {
|
|
12515
|
+
label: selectedLabel,
|
|
12516
|
+
userId: prepared.gate.answeredBy,
|
|
12517
|
+
kind: selectedLabel === SKIP_ANSWER_LABEL ? "skip" : "custom"
|
|
12518
|
+
};
|
|
12519
|
+
return answerToolResult(answer);
|
|
12496
12520
|
}
|
|
12497
12521
|
if (prepared.outcome === "pending") {
|
|
12498
12522
|
if (prepared.gate.ownerId !== ownerId) {
|
|
@@ -12573,7 +12597,7 @@ function createAskUserRuntime(host) {
|
|
|
12573
12597
|
function cancelPendingAskUserQuestions(topicId, queryId) {
|
|
12574
12598
|
defaultAskUserRuntime.cancelPendingQuestions(topicId, queryId);
|
|
12575
12599
|
}
|
|
12576
|
-
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;
|
|
12600
|
+
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;
|
|
12577
12601
|
var init_ask_user = __esm(async () => {
|
|
12578
12602
|
init_common();
|
|
12579
12603
|
await __promiseAll([
|
|
@@ -14979,7 +15003,8 @@ function mergeRuntimeUserTurnRequest(input) {
|
|
|
14979
15003
|
return db.transaction(() => {
|
|
14980
15004
|
const rows = db.query("SELECT * FROM runtime_user_turn_requests WHERE topic_id = ? ORDER BY created_at ASC, rowid ASC").all(input.topicId);
|
|
14981
15005
|
const thread = input.execution.threadRootId;
|
|
14982
|
-
const
|
|
15006
|
+
const kept = new Set(input.keepRequestIds ?? []);
|
|
15007
|
+
const sameThread = rows.map(rowToRequest).filter((request) => request.execution?.threadRootId === thread && !kept.has(request.requestId));
|
|
14983
15008
|
const actor = requestActor(input.execution.actorUserId);
|
|
14984
15009
|
let firstMergeable = sameThread.length;
|
|
14985
15010
|
while (firstMergeable > 0 && requestActor(sameThread[firstMergeable - 1].execution?.actorUserId) === actor) {
|
|
@@ -19034,6 +19059,10 @@ function createRequestVaultRuntime(host) {
|
|
|
19034
19059
|
if (rawIdempotencyKey.length > MAX_IDEMPOTENCY_KEY_CHARS2) {
|
|
19035
19060
|
return errorResult(`Error: idempotency_key must be at most ${MAX_IDEMPOTENCY_KEY_CHARS2} characters.`);
|
|
19036
19061
|
}
|
|
19062
|
+
if (input.overwrite !== undefined && typeof input.overwrite !== "boolean") {
|
|
19063
|
+
return errorResult("Error: overwrite must be a boolean.");
|
|
19064
|
+
}
|
|
19065
|
+
const overwrite = input.overwrite === true;
|
|
19037
19066
|
const bodyHash = requestBodyHash(key, description);
|
|
19038
19067
|
const createGate = () => {
|
|
19039
19068
|
const suffix = createId();
|
|
@@ -19076,9 +19105,9 @@ function createRequestVaultRuntime(host) {
|
|
|
19076
19105
|
if (prepared.outcome !== "created") {
|
|
19077
19106
|
return errorResult("Error: failed to create a durable request_vault_secret gate.");
|
|
19078
19107
|
}
|
|
19079
|
-
if (host.vault.hasKey(ctx.userId, key)) {
|
|
19108
|
+
if (host.vault.hasKey(ctx.userId, key) && !overwrite) {
|
|
19080
19109
|
host.durability.gates.quarantine(prepared.gate.gateId, ownerId, now());
|
|
19081
|
-
return errorResult(`Error: vault key '${key}' already exists.
|
|
19110
|
+
return errorResult(`Error: vault key '${key}' already exists. Call again with overwrite: true to replace its value, or pick a different key.`);
|
|
19082
19111
|
}
|
|
19083
19112
|
let message;
|
|
19084
19113
|
try {
|
|
@@ -19114,10 +19143,11 @@ function createRequestVaultRuntime(host) {
|
|
|
19114
19143
|
function createToolDefinition(ctx) {
|
|
19115
19144
|
return {
|
|
19116
19145
|
name: "request_vault_secret",
|
|
19117
|
-
description: "Ask the user to store a
|
|
19146
|
+
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.",
|
|
19118
19147
|
schema: {
|
|
19119
|
-
key: z4.string().describe("
|
|
19148
|
+
key: z4.string().describe("Vault key name, e.g. STRIPE_API_KEY. Letters/digits/underscores, must start with a letter."),
|
|
19120
19149
|
description: z4.string().max(MAX_DESCRIPTION_CHARS).describe("One sentence telling the user what value to paste and where it's from."),
|
|
19150
|
+
overwrite: z4.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."),
|
|
19121
19151
|
idempotency_key: z4.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.")
|
|
19122
19152
|
},
|
|
19123
19153
|
async handler(input) {
|
|
@@ -19125,13 +19155,51 @@ function createRequestVaultRuntime(host) {
|
|
|
19125
19155
|
}
|
|
19126
19156
|
};
|
|
19127
19157
|
}
|
|
19158
|
+
async function deleteVaultSecret(ctx, input) {
|
|
19159
|
+
const topic = host.topics.getTopic(ctx.topicId);
|
|
19160
|
+
if (!topic)
|
|
19161
|
+
return errorResult(`Error: topic '${ctx.topicId}' not found.`);
|
|
19162
|
+
if (!topic.participants.some((participant) => participant.userId === ctx.userId)) {
|
|
19163
|
+
return errorResult("Error: user is not a member of this topic.");
|
|
19164
|
+
}
|
|
19165
|
+
if (typeof input.key !== "string" || !input.key.trim()) {
|
|
19166
|
+
return errorResult("Error: key is required.");
|
|
19167
|
+
}
|
|
19168
|
+
const key = normalizeVaultKey(input.key);
|
|
19169
|
+
if (!VAULT_KEY_PATTERN.test(key)) {
|
|
19170
|
+
return errorResult("Error: key must start with a letter and contain only uppercase letters, digits, and underscores (max 128 chars).");
|
|
19171
|
+
}
|
|
19172
|
+
let deleted;
|
|
19173
|
+
try {
|
|
19174
|
+
deleted = host.vault.del(ctx.userId, key);
|
|
19175
|
+
} catch (error) {
|
|
19176
|
+
return errorResult(`Error: failed to delete vault key '${key}': ${error instanceof Error ? error.message : String(error)}`);
|
|
19177
|
+
}
|
|
19178
|
+
if (!deleted) {
|
|
19179
|
+
return errorResult(`Error: vault key '${key}' does not exist.`);
|
|
19180
|
+
}
|
|
19181
|
+
return textResult(`Deleted vault key ${key}.`);
|
|
19182
|
+
}
|
|
19183
|
+
function createDeleteToolDefinition(ctx) {
|
|
19184
|
+
return {
|
|
19185
|
+
name: "delete_vault_secret",
|
|
19186
|
+
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.",
|
|
19187
|
+
schema: {
|
|
19188
|
+
key: z4.string().describe("Vault key name to delete, e.g. STRIPE_API_KEY.")
|
|
19189
|
+
},
|
|
19190
|
+
async handler(input) {
|
|
19191
|
+
return deleteVaultSecret(ctx, input);
|
|
19192
|
+
}
|
|
19193
|
+
};
|
|
19194
|
+
}
|
|
19128
19195
|
return {
|
|
19129
19196
|
startGateOwner,
|
|
19130
19197
|
stopGateOwner,
|
|
19131
19198
|
reconcilePendingGates,
|
|
19132
19199
|
answerPendingRequest,
|
|
19133
19200
|
cancelPendingRequests,
|
|
19134
|
-
createToolDefinition
|
|
19201
|
+
createToolDefinition,
|
|
19202
|
+
createDeleteToolDefinition
|
|
19135
19203
|
};
|
|
19136
19204
|
}
|
|
19137
19205
|
function cancelPendingVaultSecretRequests(topicId, queryId) {
|
|
@@ -19186,7 +19254,8 @@ var init_request_vault = __esm(async () => {
|
|
|
19186
19254
|
},
|
|
19187
19255
|
vault: {
|
|
19188
19256
|
hasKey: vaultHasKey,
|
|
19189
|
-
set: vaultSet
|
|
19257
|
+
set: vaultSet,
|
|
19258
|
+
del: vaultDel
|
|
19190
19259
|
},
|
|
19191
19260
|
durability: defaultRequestVaultDurabilityHost,
|
|
19192
19261
|
runtime: {
|
|
@@ -23770,4 +23839,4 @@ export {
|
|
|
23770
23839
|
DEFAULT_SELF_CONFIG_PRODUCT
|
|
23771
23840
|
};
|
|
23772
23841
|
|
|
23773
|
-
//# debugId=
|
|
23842
|
+
//# debugId=FA0D4C979A11209F64756E2164756E21
|