@songsid/agend 2.2.0-beta.9 → 2.2.0

package/dist/outbound-handlers.js

@@ -1,10 +1,10 @@
-import { validateFleetConfig } from "./config-validator.js";
+import { KNOWN_BACKENDS, validateFleetConfig } from "./config-validator.js";
 import { resolve as pathResolve, isAbsolute } from "node:path";
 import { homedir } from "node:os";
 import { randomUUID } from "node:crypto";
 import { deliveryContentDigest, deliveryStatusSelector } from "./delivery-outbox.js";
 import { GENERAL_PAUSE_ERROR, isGeneralInstance } from "./general-instance.js";
-import { DEFAULT_MAX_CROSS_INSTANCE_MESSAGE_BYTES, DEFAULT_LIST_INSTANCES_OUTPUT_BUDGET, MAX_INSTANCE_LOG_LINES } from "./config.js";
+import { DEFAULT_MAX_CROSS_INSTANCE_MESSAGE_BYTES, DEFAULT_LIST_INSTANCES_OUTPUT_BUDGET, MAX_INSTANCE_LOG_LINES, getEffectiveInstanceDefaults } from "./config.js";
 import { t } from "./locale.js";
 import { presentationState, interactionSummary } from "./interaction-observation.js";
 import { truncatePreview } from "./channel/markdown-chunk.js";
@@ -14,7 +14,7 @@ import { assignDisplayLabels, displayInstanceName, readStatuslineModel } from ".
 import { CHAT_PROFILE_LOGIN_BACKENDS, credentialProfileLogin, credentialSwitchCarriesConversation, credentialSwitchStartsFresh, instanceCredentialProfile } from "./backend/credential-profile.js";
 import { kiroEngineCandidates, kiroEngineStatus } from "./kiro-engine-status.js";
 import { formatCrossInstanceInboundMessage, MAX_ASSEMBLED_CROSS_INSTANCE_MESSAGE_BYTES, } from "./cross-instance-envelope.js";
-import { BroadcastArgs, CreateInstanceArgs, CreateTeamArgs, DelegateTaskArgs, DeleteInstanceArgs, DeleteTeamArgs, DeployTemplateArgs, DescribeInstanceArgs, ListDeploymentsArgs, ListInstancesArgs, ListTeamsArgs, ReplaceInstanceArgs, ReportResultArgs, DeliveryStatusArgs, RequestInformationArgs, RestartInstanceArgs, SendToInstanceArgs, PauseInstanceArgs, WakeInstanceArgs, StopInstanceArgs, GetInstanceLogsArgs, GetEffortArgs, KiroEngineStatusArgs, GetUsageArgs, ListModelsArgs, GetFleetConfigArgs, UpdateInstanceConfigArgs, UpdateFleetDefaultsArgs, StartInstanceArgs, TeardownDeploymentArgs, UpdateTeamArgs, validateArgs, } from "./outbound-schemas.js";
+import { BroadcastArgs, CreateInstanceArgs, CreateTeamArgs, DelegateTaskArgs, DeleteInstanceArgs, DeleteTeamArgs, DeployTemplateArgs, DescribeInstanceArgs, ListDeploymentsArgs, ListInstancesArgs, ListTeamsArgs, ReplaceInstanceArgs, ReportResultArgs, DeliveryStatusArgs, RequestInformationArgs, RestartInstanceArgs, SendToInstanceArgs, PauseInstanceArgs, WakeInstanceArgs, StopInstanceArgs, GetInstanceLogsArgs, GetEffortArgs, ClosePollArgs, KiroEngineStatusArgs, GetUsageArgs, ListModelsArgs, GetFleetConfigArgs, UpdateInstanceConfigArgs, UpdateFleetDefaultsArgs, StartInstanceArgs, TeardownDeploymentArgs, UpdateTeamArgs, validateArgs, } from "./outbound-schemas.js";
 const HOME_DIR = homedir();
 function formatByteSize(bytes) {
     if (bytes < 1024)
@@ -787,6 +787,25 @@ const kiroEngineStatusHandler = (ctx, rawArgs, respond) => {
     }
     respond(status);
 };
+/** #1823: close one of the caller's own polls before its deadline; its results then go out as at the deadline. */
+const closePoll = async (ctx, rawArgs, respond, meta) => {
+    const v = validateArgs(ClosePollArgs, rawArgs, "close_poll");
+    if (!v.ok) {
+        respond(null, v.error);
+        return;
+    }
+    const fm = ctx;
+    const instance = meta?.instanceName; // whose polls: the instance's (as the reply recorded)
+    if (!instance || !fm.closePollEarly) {
+        respond(null, "close_poll is not available here");
+        return;
+    }
+    const r = await fm.closePollEarly(instance, v.data.poll_id);
+    if (r.ok)
+        respond({ closed: true, poll_id: v.data.poll_id, voted: r.voted });
+    else
+        respond(null, `close_poll: ${r.error}`);
+};
 const getEffort = (ctx, rawArgs, respond, meta) => {
     const v = validateArgs(GetEffortArgs, rawArgs, "get_effort");
     if (!v.ok) {
@@ -945,31 +964,86 @@ const updateInstanceConfig = (ctx, rawArgs, respond) => {
         respond(null, v.error);
         return;
     }
-    const inst = ctx.fleetConfig?.instances[v.data.name];
+    applyInstanceConfigPatch(ctx, v.data.name, v.data.config, respond);
+};
+/**
+ * update_instance_config's write: one validated config write, rolled back whole on a refusal, then one relaunch when
+ * the backend (fresh, #1217), a credential profile or backend_options changed. Answers through `respond` like the tool.
+ */
+export function applyInstanceConfigPatch(ctx, name, patch, respond) {
+    const inst = ctx.fleetConfig?.instances[name];
     if (!inst) {
         const isClassic = (ctx.classicChannels?.getAll() ?? [])
-            .some(channel => channel.instanceName === v.data.name);
+            .some(channel => channel.instanceName === name);
         respond(null, isClassic
             ? "This is a ClassicBot instance (managed in classicBot.yaml). Use set_display_name or set_description to configure it."
-            : `Instance '${v.data.name}' not found in fleet config`);
+            : `Instance '${name}' not found in fleet config`);
         return;
     }
-    const patch = v.data.config;
     // Read before anything is mutated: the switch is what decides whether the
     // next launch may resume, and by then `inst` already holds the new value.
-    const backendBefore = inst.backend ?? "claude-code";
+    // The backend an instance runs: its own, else the fleet default (#1815 review: a Settings-created entry may omit it).
+    const effectiveBackend = () => inst.backend ?? ctx.fleetConfig?.defaults?.backend ?? "claude-code";
+    const backendBefore = effectiveBackend();
+    // #1808: a model and an effort name the backend they were chosen for. On a switch the new backend gets the ones
+    // given — if it takes them, refused here before anything is written — or none of the instance's own (the inherited
+    // value, else the CLI's default). Never the old backend's: codex launched with `--model opus` fails every turn.
+    if (patch.backend !== undefined && patch.backend !== backendBefore) {
+        const backendNew = patch.backend;
+        // Only a backend AgEnD knows gets these checks; any other name is refused by validation below, as before (and a
+        // "__proto__" or "toString" never reaches a lookup keyed by backend name).
+        const known = KNOWN_BACKENDS.includes(backendNew);
+        // The provider the new backend will run on (#1815 review): this patch's backend_options over the instance's, else
+        // the fleet defaults' — a custom provider has its own catalog, which the account's list says nothing about.
+        const options = mergeBackendOptions(inst.backend_options, patch.backend_options ?? {})[backendNew]
+            ?? ctx.fleetConfig?.defaults?.backend_options?.[backendNew];
+        const rawProvider = options?.provider;
+        const provider = typeof rawProvider === "string" && rawProvider.trim() ? rawProvider.trim() : null;
+        if (known && typeof patch.model === "string") {
+            const verdict = ctx.backendModelVerdict?.(name, backendNew, patch.model, { provider });
+            if (verdict && !verdict.ok) {
+                respond(null, `Rejected: ${backendNew} does not take the model "${patch.model}". ${verdict.choices.length
+                    ? `Choose one of: ${verdict.choices.join(", ")}` : `No ${backendNew} model list is known yet`} — or leave model out for its default.`);
+                return;
+            }
+        }
+        if (known && typeof patch.effort === "string") {
+            // The levels of the model that will run there (codex's differ per model): the one given, else the inherited one.
+            const inheritedModel = getEffectiveInstanceDefaults(ctx.fleetConfig?.defaults).model;
+            const runs = typeof patch.model === "string" ? patch.model : typeof inheritedModel === "string" ? inheritedModel : null;
+            const levels = ctx.backendEffortLevels?.(name, backendNew, runs);
+            if (levels && !levels.includes(patch.effort)) {
+                respond(null, levels.length
+                    ? `Rejected: ${backendNew} takes no effort "${patch.effort}" at launch on this host. Choose one of: ${levels.join(", ")} — or leave effort out for its default.`
+                    : `Rejected: ${backendNew} takes no effort at launch on this host — leave effort out.`);
+                return;
+            }
+        }
+        patch = { ...patch, model: patch.model === undefined ? null : patch.model, effort: patch.effort === undefined ? null : patch.effort };
+    }
     const profileBefore = instanceCredentialProfile(inst, ctx.fleetConfig?.defaults, backendBefore);
     // Snapshot enough to undo the whole patch if validation refuses it.
     const beforeEdit = validateFleetConfig(ctx.fleetConfig);
     const beforeFields = {};
-    for (const key of ["backend", "model", "auto_pause_after", "display_name", "description"]) {
+    for (const key of ["backend", "model", "effort", "auto_pause_after", "display_name", "description"]) {
         if (patch[key] !== undefined)
             beforeFields[key] = inst[key];
     }
     if (patch.backend !== undefined)
         inst.backend = patch.backend;
-    if (patch.model !== undefined)
-        inst.model = patch.model;
+    // null: the value this instance would have with no override of its own — what loading fleet.yaml gives it.
+    const inherited = getEffectiveInstanceDefaults(ctx.fleetConfig?.defaults);
+    for (const key of ["model", "effort"]) {
+        const value = patch[key];
+        if (value === undefined)
+            continue;
+        if (value !== null)
+            inst[key] = value;
+        else if (inherited[key] !== undefined)
+            inst[key] = inherited[key];
+        else
+            delete inst[key];
+    }
     if (patch.auto_pause_after !== undefined)
         inst.auto_pause_after = patch.auto_pause_after;
     if (patch.display_name !== undefined)
@@ -983,20 +1057,7 @@ const updateInstanceConfig = (ctx, rawArgs, respond) => {
     let relaunchNeeded = false;
     if (patch.backend_options !== undefined) {
         const before = JSON.stringify(previousOptions ?? {});
-        const merged = { ...(previousOptions ?? {}) };
-        for (const [backendName, options] of Object.entries(patch.backend_options)) {
-            const namespace = { ...(merged[backendName] ?? {}), ...options };
-            // A merge cannot express removal, so null (or "") means "drop this key"
-            // — that is how an agent goes back to the fleet's default login.
-            for (const [key, value] of Object.entries(options)) {
-                if (value === null || value === "")
-                    delete namespace[key];
-            }
-            if (Object.keys(namespace).length)
-                merged[backendName] = namespace;
-            else
-                delete merged[backendName];
-        }
+        const merged = mergeBackendOptions(previousOptions, patch.backend_options);
         inst.backend_options = merged;
         relaunchNeeded = JSON.stringify(merged) !== before;
     }
@@ -1024,7 +1085,7 @@ const updateInstanceConfig = (ctx, rawArgs, respond) => {
         respond(null, `Rejected: ${introduced.map(issue => `${issue.path}: ${issue.message}`).join("; ")}`);
         return;
     }
-    const backendAfter = inst.backend ?? "claude-code";
+    const backendAfter = effectiveBackend();
     const profileAfter = instanceCredentialProfile(inst, ctx.fleetConfig?.defaults, backendAfter);
     const profileSwitched = profileAfter !== profileBefore;
     // #1217: a running CLI is the backend it was launched as. Saving a new
@@ -1047,7 +1108,9 @@ const updateInstanceConfig = (ctx, rawArgs, respond) => {
     // the escape hatch from a bad switch and must never be the thing that is
     // blocked, and an unlogged shared store means the CLI was never set up at
     // all — a state that predates this feature.
-    if (profileSwitched && profileAfter) {
+    // #1806 review: a profile is a login of ONE backend — the same name under another backend is another store, so a
+    // backend switch onto a named profile is checked too (claude-code "personal" says nothing about kiro-cli "personal").
+    if ((profileSwitched || backendSwitched) && profileAfter) {
         // The same root the launcher resolves the profile under, so the store this
         // probes is the store the CLI will be pointed at.
         const login = credentialProfileLogin(ctx.dataDir, backendAfter, profileAfter);
@@ -1068,18 +1131,18 @@ const updateInstanceConfig = (ctx, rawArgs, respond) => {
         return;
     }
     if (!relaunchNeeded) {
-        respond({ success: true, name: v.data.name, applied: patch });
+        respond({ success: true, name, applied: patch });
         return;
     }
     // Only a running instance is restarted. Switching the subscription of a
     // paused or stopped agent must not start it — restartSingleInstance is
     // stop-then-start and would — so the new credentials are read whenever it
     // next comes up on its own.
-    const status = targetState(ctx, v.data.name);
+    const status = targetState(ctx, name);
     if (status !== "running") {
         respond({
             success: true,
-            name: v.data.name,
+            name,
             applied: patch,
             restarted: false,
             note: `Instance is ${status}; the new ${backendSwitched ? "backend" : "backend_options"} apply when it next starts.`,
@@ -1106,19 +1169,19 @@ const updateInstanceConfig = (ctx, rawArgs, respond) => {
         ? { backend: backendAfter, from: profileBefore, to: profileAfter, result: null }
         : null;
     const handover = switchLosesConversation
-        ? (ctx.lifecycle.daemons.get(v.data.name)?.collectHandoverContext() ?? "")
+        ? (ctx.lifecycle.daemons.get(name)?.collectHandoverContext() ?? "")
         : "";
     // Saving without restarting would report a subscription switch that has not
     // happened — the running CLI keeps the credentials it was launched with.
     // A switch that cannot take the conversation along starts fresh: the new store
     // has no conversation for this directory, so resuming can only spend the
     // resume startup budget waiting for something that is not there.
-    ctx.restartSingleInstance(v.data.name, carry ? { carry } : switchLosesConversation || backendSwitched ? { freshStart: true } : undefined).then(async () => {
+    ctx.restartSingleInstance(name, carry ? { carry } : switchLosesConversation || backendSwitched ? { freshStart: true } : undefined).then(async () => {
         const carried = carry?.result?.carried === true;
-        const handoverChars = carried ? 0 : await deliverProfileHandover(ctx, v.data.name, profileBefore, profileAfter, handover);
+        const handoverChars = carried ? 0 : await deliverProfileHandover(ctx, name, profileBefore, profileAfter, handover);
         respond({
             success: true,
-            name: v.data.name,
+            name,
             applied: patch,
             restarted: true,
             ...(backendSwitched ? { backend_switched: true, conversation_carried_over: false } : {}),
@@ -1140,12 +1203,32 @@ const updateInstanceConfig = (ctx, rawArgs, respond) => {
         });
     }, (err) => respond({
         success: true,
-        name: v.data.name,
+        name,
         applied: patch,
         restarted: false,
         warning: `Config saved, but the restart failed: ${err.message}. The new backend_options take effect on the next start.`,
     }));
-};
+}
+/**
+ * backend_options merged per backend namespace, so setting a kiro option cannot silently drop a codex one. A merge
+ * cannot express removal, so null (or "") means "drop this key" — that is how an agent goes back to the fleet's
+ * default login.
+ */
+function mergeBackendOptions(previous, patch) {
+    const merged = { ...(previous ?? {}) };
+    for (const [backendName, options] of Object.entries(patch)) {
+        const namespace = { ...(merged[backendName] ?? {}), ...options };
+        for (const [key, value] of Object.entries(options)) {
+            if (value === null || value === "")
+                delete namespace[key];
+        }
+        if (Object.keys(namespace).length)
+            merged[backendName] = namespace;
+        else
+            delete merged[backendName];
+    }
+    return merged;
+}
 /** Long enough for the relaunched CLI to be listening; matches replace_instance. */
 export const PROFILE_HANDOVER_SETTLE_MS = 3_000;
 /**
@@ -1886,6 +1969,7 @@ export const outboundHandlers = new Map([
     ["stop_instance", stopInstance],
     ["get_fleet_status", getFleetStatus],
     ["get_effort", getEffort],
+    ["close_poll", closePoll],
     ["kiro_engine_status", kiroEngineStatusHandler],
     ["get_usage", getUsage],
     ["list_models", listModels],