@songsid/agend 2.3.2-beta.10 → 2.3.2-beta.11

package/dist/fleet-manager.js

@@ -1,4 +1,7 @@
-import { hasLegacyOffice, normalizeOfficeStorage } from "./dashboard-permissions.js";
+import { getCachedKiroCliCompatibility, kiroV1DbPath, kiroV2SessionsDir } from "./backend/kiro.js";
+import { readKiroV1SavedModel } from "./backend/kiro-retired-model.js";
+import { sharedKiroV2StoreLane } from "./backend/kiro-v2-store.js";
+import { SEPARATE_FEATURE_KEYS, hasLegacyOffice, normalizeOfficeStorage } from "./dashboard-permissions.js";
 import { loginNoticeMode, normalizeNoticeDelivery, setNoticeMode } from "./notice-delivery.js";
 import { DEFAULT_REPLY_TRIGGERS } from "./reply-triggers.js";
 import { WorkingRecoveryCoordinator, WORKING_RECOVERY_KIND, buildWorkingRecoveryPrompt } from "./working-recovery.js";
@@ -83,7 +86,7 @@ import { createBackend } from "./backend/factory.js";
 import { readEffortMetadata } from "./backend/effort-metadata.js";
 import { codexEffort, flagEffort } from "./backend/launch-effort.js";
 import { codexMetadataHomes, readCodexModelEffortLevels, resolveCodexLaunchModel } from "./backend/codex-metadata.js";
-import { CLI_ENV_TTL_MS, isModelCompatible, noteResolvedBinary, resolveBinary, SYSINFO_BACKEND_IDS, UnsupportedCliError } from "./backend/types.js";
+import { CLI_ENV_TTL_MS, isModelCompatible, noteResolvedBinary, resolveBinary, SYSINFO_BACKEND_IDS, UnsupportedCliError, ResumeBlockedError } from "./backend/types.js";
 import { createLogger, rotateLogIfNeeded } from "./logger.js";
 import { processAttachments } from "./channel/attachment-handler.js";
 import { routeToolCall } from "./channel/tool-router.js";
@@ -170,6 +173,7 @@ import { ThemeStore } from "./web-theme-store.js";
 import { OfficeStore, OfficeWriteLimiter } from "./web-office-store.js";
 import { OfficeSkinStore } from "./web-office-skins.js";
 import { OfficeActs } from "./web-office-acts.js";
+import { OFFICE_PACK_TOOLS, OfficePackTools } from "./web-office-pack-tools.js";
 import { WebAppearance } from "./web-appearance.js";
 import { WebEffectLibrary } from "./web-effect-library.js";
 import { WebEffectTrials } from "./web-effect-trials.js";
@@ -225,6 +229,7 @@ import { ONBOARDING_BACKENDS, readPendingBackendSignIns } from "./backend-signin
 import { structuredSignInSupported } from "./structured-signin.js";
 import { handleSettingsRequest } from "./settings-api.js";
 import { setLocale, detectLocale, getLocale, t } from "./locale.js";
+import { remoteCardAction, remoteCardChoiceLabel, remoteCardOutcomeText, remoteCardPrompt, REMOTE_CARD_TEXT_MAX } from "./remote-card-prompt.js";
 import { recentChatContext } from "./log-tail.js";
 import { describeSignalSource, recordInternalRequest, withOrigin } from "./fleet-control-audit.js";
 import { handleAgentRequest, ToolNotPermittedError } from "./agent-endpoint.js";
@@ -478,6 +483,13 @@ const MODEL_SELECT_CALLBACK_PREFIX = "model-select:";
 const EFFORT_SELECT_CALLBACK_PREFIX = "effort-select:";
 const BACKEND_SELECT_CALLBACK_PREFIX = "backend-select:";
 const INTERACTIVE_ASSIST_CALLBACK_PREFIX = "interactive-assist:";
+/** #2675: a card a CLI shows in place of its composer (kiro V3's Question / MCP input), posted with its answers. */
+const REMOTE_CARD_CALLBACK_PREFIX = "card-answer:";
+const REMOTE_CARD_CALLBACK_RE = /^card-answer:([0-9a-f]{32}):(opt-\d{1,2}|sub-all|sub-\d{1,2}|back|skip|decline|cancel|text)$/;
+/** A posted card's buttons stay this long; the card itself waits in the pane for as long as it takes. */
+const REMOTE_CARD_TIMEOUT_MS = 12 * 60 * 60_000;
+/** A reply already taken as a card's answer is remembered this long, so another bot's copy of it is dropped (#2675). */
+const REMOTE_CARD_TAKEN_TTL_MS = 10 * 60_000;
 const EXIT_RESTART_CALLBACK_PREFIX = "exit-restart:";
 const OOM_RETRY_CALLBACK_PREFIX = "oom-retry:";
 /** #1386: how long a paused instance's marker reason is reused before it is read again (transitions drop it at once). */
@@ -486,6 +498,10 @@ const HANG_CALLBACK_PREFIX = "hang:";
 const CLEAR_CONFIRM_CALLBACK_PREFIX = "clear-confirm:";
 /** #2598 B2: a kiro classic → TUI move's Confirm in General. "kiro-migrate:" (13) + 32 hex + ":confirm" (8) = 53 bytes. */
 const KIRO_MIGRATE_CALLBACK_PREFIX = "kiro-migrate:";
+/** #2692: a fleet admin's Approve / Reject on an agent's pending skin-pack change, in General. */
+const OFFICE_PACK_CALLBACK_PREFIX = "office-pack:";
+/** #2692: the skin-pack tools' IPC types (answered as web theme tools). */
+const OFFICE_PACK_IPC = new Set(OFFICE_PACK_TOOLS.map(tool => `fleet_${tool}`));
 /** Long enough for an admin to read the prompt; the move is judged again on the click. */
 const KIRO_MIGRATE_TIMEOUT_MS = 10 * 60_000;
 /**
@@ -496,6 +512,7 @@ const KIRO_MIGRATE_TIMEOUT_MS = 10 * 60_000;
  */
 const WEB_MIRRORED_PROMPT_PREFIXES = new Set([
     HANG_CALLBACK_PREFIX, EXIT_RESTART_CALLBACK_PREFIX, OOM_RETRY_CALLBACK_PREFIX, INTERACTIVE_ASSIST_CALLBACK_PREFIX,
+    REMOTE_CARD_CALLBACK_PREFIX,
 ]);
 /**
  * Where a reply goes on a fleet with no chat platform (web track C4): it is "sent" by being shown in the
@@ -913,6 +930,7 @@ export class FleetManager {
     pendingNonceButtons = new Map();
     /** #2598 B2: the kiro moves waiting on a fleet admin's Confirm in General, by prompt nonce. */
     pendingKiroMigrations = new Map();
+    kiroMigrationRuns = new Map();
     /** #1386 "Needs you": the list, its live chat messages and Acknowledge. Started with the fleet (finishStartup). */
     needsYou = null;
     /** When the fleet first saw an instance crashed, for its "Needs you" age; cleared when it is not. */
@@ -925,6 +943,12 @@ export class FleetManager {
      * adapter emits — whatever fields its payload carries — can claim a dashboard click's authority.
      */
     webPromptClicks = new WeakSet();
+    /** #2675: a dashboard click's typed answer, for the click it came with. */
+    webPromptTexts = new WeakMap();
+    /** #2675: the nonce of each instance's posted card. */
+    remoteCardPosts = new Map();
+    /** #2675: replies taken as a card's answer (`<chatId>|<messageId>` → monotonic expiry), so another bot's copy is dropped. */
+    takenCardReplies = new Map();
     /** The web clicks consumeNonceCallback actually claimed (the others were refused or lost a race). */
     webPromptClaims = new WeakSet();
     // Model failover state
@@ -1235,6 +1259,98 @@ export class FleetManager {
             changed: acts => this.emitSseEvent("office_acts", { acts, now: Date.now() }),
         }));
     }
+    officePackToolsInstance;
+    /** #2692: the agents' skin-pack tools — their log, the admins' approval mode and the pending changes (memory only). */
+    get officePackTools() {
+        return (this.officePackToolsInstance ??= new OfficePackTools({
+            skins: this.officeSkins, offices: this.officeStore,
+            allowedAgents: () => this.officePackAgents(),
+            notice: (text, pending) => { void this.officePackNotice(text, pending); },
+            settled: (id, text) => this.settleOfficePackPrompt(id, text),
+            changed: what => {
+                if (what.skins !== undefined)
+                    this.emitSseEvent("office_skins", { rev: what.skins });
+                if (what.offices !== undefined)
+                    this.emitSseEvent("offices", { rev: what.offices });
+                if (what.changes)
+                    this.emitSseEvent("office_pack_changes", {});
+            },
+            logger: this.logger,
+        }));
+    }
+    /** #2692: the instances whose `office_packs` feature is on (their own switch, else the defaults'): the Office page lists them. */
+    officePackAgents() {
+        const names = new Set([...Object.keys(this.fleetConfig?.instances ?? {}), ...(this.classicChannels?.getAll() ?? []).map(ch => ch.instanceName)]);
+        return [...names].filter(name => dashboardRefusalIn(this.fleetConfig, name, "office_pack_upload") === null);
+    }
+    /** #2692: the nonce of each pending pack change's prompt in General (its buttons are retired when it is decided). */
+    officePackPrompts = new Map();
+    /**
+     * #2692: tell the fleet's admins of an agent's pack change — one short message in General (notifyFleetError, never a
+     * sign-in notice). A pending one comes with Approve / Reject (a fleet admin's, as a kiro move); where no General can
+     * carry buttons it is the plain message, and the Office page decides it.
+     */
+    async officePackNotice(text, pending) {
+        if (!pending) {
+            this.notifyFleetError(text, { throttle: false });
+            return;
+        }
+        const general = this.findGeneralInstance();
+        const adapterId = general ? this.getInstanceAdapterId(general) : undefined;
+        const adapter = general ? this.getAdapterForInstance(general) : undefined;
+        const chatId = general ? this.getGroupIdForInstance(general) : undefined;
+        const topic = general ? String(this.fleetConfig?.instances[general]?.topic_id ?? "") : "";
+        if (general && adapterId && adapter && chatId) {
+            try {
+                const nonce = await this.postNonceButtonPromptOrThrow({
+                    prefix: OFFICE_PACK_CALLBACK_PREFIX, alertType: "clear_confirm", instanceName: pending.instance, adapter, adapterId, chatId,
+                    ...(topic ? { threadId: topic } : {}), message: text,
+                    choices: [{ action: "approve", label: t("office_packs.approve_button") }, { action: "reject", label: t("office_packs.reject_button") }],
+                    expiredText: t("office_packs.expired", ""), timeoutMs: Math.max(1_000, pending.expires_at - Date.now()),
+                });
+                if (this.officePackTools.pendingViews().some(v => v.id === pending.id))
+                    this.officePackPrompts.set(pending.id, nonce);
+                else
+                    this.retireOfficePackNonce(nonce, t("office_packs.gone"));
+                return;
+            }
+            catch (err) {
+                this.logger.info({ err: err.message }, "Office pack approval prompt unavailable; the plain notice and the Office page remain");
+            }
+        }
+        this.notifyFleetError(text, { throttle: false });
+    }
+    retireOfficePackNonce(nonce, text) {
+        const entry = this.pendingNonceButtons.get(nonce);
+        if (!entry || entry.prefix !== OFFICE_PACK_CALLBACK_PREFIX)
+            return;
+        this.pendingNonceButtons.delete(nonce);
+        clearTimeout(entry.timer);
+        void this.retireNonceButtons(entry, entry.messageId ?? "", text);
+    }
+    /** #2692: a pending change was decided (here or on the page) or expired: its prompt says so and loses its buttons. */
+    settleOfficePackPrompt(id, text) {
+        const nonce = this.officePackPrompts.get(id);
+        this.officePackPrompts.delete(id);
+        if (nonce)
+            this.retireOfficePackNonce(nonce, text);
+    }
+    /** #2692: Approve / Reject on a pending pack change. Any fleet admin (the default nonce authorization), in General. */
+    async handleOfficePackCallback(data, adapterId, adapter) {
+        const claimed = this.consumeNonceCallback(OFFICE_PACK_CALLBACK_PREFIX, /^office-pack:([0-9a-f]{32}):(approve|reject)$/, data, adapterId, adapter);
+        if (claimed === null)
+            return false;
+        if (claimed === "consumed")
+            return true;
+        const { entry, action } = claimed;
+        const nonce = data.callbackData.slice(OFFICE_PACK_CALLBACK_PREFIX.length, OFFICE_PACK_CALLBACK_PREFIX.length + 32);
+        const id = [...this.officePackPrompts].find(([, n]) => n === nonce)?.[0];
+        if (id)
+            this.officePackPrompts.delete(id);
+        const decided = id ? this.officePackTools.decide(id, action, t("settings_confirm.admin_label", data.userId ?? "")) : null;
+        await this.retireNonceButtons(entry, entry.messageId ?? data.messageId, decided?.text ?? t("office_packs.gone"));
+        return true;
+    }
     /**
      * #2578: each instance's state as the org chart shows it (fleet-org.js orgState, from the same fields the status
      * frame and the Needs-you list carry) and its display name (resolveInstanceIdentity, as getUiStatus) — read once.
@@ -1797,12 +1913,93 @@ export class FleetManager {
         this.logger.info({ id: view.id }, "Settings change requires local `agend settings confirm <id>`");
     }
     kiroMigrateDeps() {
+        let token;
+        const current = (name) => {
+            const run = this.kiroMigrationRuns.get(name);
+            return !!token && run?.token === token && !this.shuttingDown
+                && (this.explicitStopGeneration.get(name) ?? 0) === run.stopGeneration;
+        };
         return {
-            agendHome: getAgendHome(),
-            fleetConfig: () => this.fleetConfig,
-            saveFleetConfig: () => this.saveFleetConfig(),
+            agendHome: getAgendHome(), fleetConfig: () => this.fleetConfig, saveFleetConfig: () => this.saveFleetConfig(),
             status: name => this.getInstanceStatus(name),
-            restart: name => this.restartSingleInstance(name, { explicit: true }),
+            reserve: name => {
+                if (this.kiroMigrationRuns.has(name) || this.restartsInFlight.has(name) || this.stopsInFlight.has(name))
+                    throw new Error(t("kiro_migrate.in_progress"));
+                token = Symbol(name);
+                this.kiroMigrationRuns.set(name, { token, stopGeneration: this.explicitStopGeneration.get(name) ?? 0 });
+                return { current: () => current(name), release: () => {
+                        if (this.kiroMigrationRuns.get(name)?.token === token)
+                            this.kiroMigrationRuns.delete(name);
+                        this.scheduleDeliveryOutboxPump();
+                    } };
+            },
+            preflight: async (name, plan) => {
+                const compat = getCachedKiroCliCompatibility(resolveBinary("kiro-cli"));
+                if (!compat.supportsTui || !compat.supportsInstanceAgent || !compat.agentEngines?.includes("v2")
+                    || !/^2\.(?:3[4-9]|[4-9]\d|\d{3,})\./.test(compat.version ?? ""))
+                    throw new Error(t("kiro_migrate.version_required"));
+                const daemon = this.daemons.get(name);
+                if (this.getInstanceStatus(name) === "running" && (!daemon || !await daemon.kiroMigrationIdle()))
+                    throw new Error(t("kiro_migrate.idle_required"));
+                if (!current(name) || daemon && this.daemons.get(name) !== daemon)
+                    throw new Error(t("kiro_migrate.superseded"));
+                const inst = this.fleetConfig?.instances[name];
+                const model = daemon?.getModelOverride() ?? inst?.model ?? (plan.classicId ? readKiroV1SavedModel({ id: plan.classicId,
+                    workingDirectory: plan.workingDirectory, dbPath: kiroV1DbPath(plan.credentialProfile) }) : undefined);
+                if (!model && plan.classicId)
+                    throw new Error(t("kiro_migrate.model_unknown"));
+                return model ?? "";
+            },
+            restart: async (name) => {
+                if (!current(name))
+                    throw new Error(t("kiro_migrate.superseded"));
+                const run = this.kiroMigrationRuns.get(name);
+                const expected = run.stopGeneration + 1;
+                // This restart owns exactly one stop. A person's concurrent stop must not be hidden by the workflow.
+                try {
+                    await this.restartSingleInstance(name, { explicit: true, kiroMigration: token });
+                }
+                finally {
+                    // Even a failed replacement owns its completed stop; retain authority to clean up/pause it.
+                    if (this.kiroMigrationRuns.get(name) === run && this.explicitStopGeneration.get(name) === expected)
+                        run.stopGeneration = expected;
+                }
+                if (this.explicitStopGeneration.get(name) !== expected)
+                    throw new Error(t("kiro_migrate.superseded"));
+            },
+            verify: async (name, id, model, archived) => {
+                const daemon = this.daemons.get(name), deadline = performance.now() + 60_000;
+                if (!daemon)
+                    throw new Error(t("kiro_migrate.verification_failed"));
+                while (performance.now() < deadline) {
+                    if (!current(name) || this.daemons.get(name) !== daemon)
+                        throw new Error(t("kiro_migrate.superseded"));
+                    const observed = await daemon.kiroMigrationObservation();
+                    if (observed) {
+                        if (observed.sessionId !== id || observed.model !== model || resolvePath(observed.transcript) !== resolvePath(kiroV2SessionsDir(), id + ".jsonl"))
+                            throw new Error(t("kiro_migrate.verification_failed"));
+                        const inst = this.fleetConfig.instances[name];
+                        const reply = await sharedKiroV2StoreLane.read({ keys: [], sessionsDir: kiroV2SessionsDir(), migration: {
+                                agendHome: getAgendHome(), instance: name, workingDirectory: inst.working_directory, credentialProfile: instanceCredentialProfile(inst, this.fleetConfig?.defaults, "kiro-cli"),
+                                sessionId: id, sessionsDir: kiroV2SessionsDir(), dbPath: kiroV1DbPath(instanceCredentialProfile(inst, this.fleetConfig?.defaults, "kiro-cli")),
+                                model, archived, outboxDbPath: join(this.dataDir, "delivery-outbox.db"), knownInstances: Object.keys(this.fleetConfig.instances),
+                            } });
+                        if (!current(name) || this.daemons.get(name) !== daemon)
+                            throw new Error(t("kiro_migrate.superseded"));
+                        if (reply.kind !== "ok" || !reply.verification)
+                            throw new Error(reply.kind === "unreadable" ? reply.detail : t("kiro_migrate.verification_failed"));
+                        return reply.verification;
+                    }
+                    await new Promise(r => setTimeout(r, 500));
+                }
+                throw new Error(t("kiro_migrate.verification_failed"));
+            },
+            stop: async (name) => { try {
+                await this.stopInstance(name);
+            }
+            finally {
+                writePausedMarker(this.getInstanceDir(name), Date.now(), "error");
+            } },
         };
     }
     /**
@@ -1860,8 +2057,7 @@ export class FleetManager {
         const outcome = await applyKiroMigration(this.kiroMigrateDeps(), plan);
         this.logger.info({ name: plan.name, ok: outcome.ok, classicId: plan.classicId }, "kiro classic → TUI move");
         this.notifyFleetError(outcome.text);
-        if (outcome.ok)
-            this.notifyInstanceTopic(plan.name, outcome.text);
+        this.notifyInstanceTopic(plan.name, outcome.text);
         return true;
     }
     async handleSettingsChangeCallback(data, adapterId, adapter) {
@@ -5937,6 +6133,11 @@ export class FleetManager {
     stopOnUnsupportedCli(name, err, what) {
         if (!(err instanceof UnsupportedCliError))
             return false;
+        if (err instanceof ResumeBlockedError) {
+            this.logger.error({ name, reason: err.message }, `Not starting ${what}: retained session needs store repair`);
+            void this.notifyFleetError(t("fleet.resume_blocked", name, err.message, err.remedy));
+            return true;
+        }
         this.logger.error({ name, reason: err.message }, `Not starting ${what}: the installed CLI cannot run it as configured`);
         this.queueUnsupportedCliNotice(name, err.message);
         this.queueKiroIncompatNotice(name, err.message);
@@ -6136,6 +6337,9 @@ export class FleetManager {
     }
     /** Restart a single instance, reloading fleet.yaml first to pick up config changes. */
     async restartSingleInstance(name, opts) {
+        const migration = this.kiroMigrationRuns?.get(name);
+        if (migration && migration.token !== opts?.kiroMigration)
+            throw new Error(t("kiro_migrate.in_progress"));
         if (opts?.recoveryCurrent && !opts.recoveryCurrent())
             throw new Error(t("exit.expired", name));
         const retry = opts?.explicit ? opts.sessionOomRetry ?? captureSessionOomRetry(this.getInstanceDir(name)) : undefined;
@@ -6196,7 +6400,7 @@ export class FleetManager {
         return run;
     }
     isInstanceRestarting(name) {
-        return this.restartsInFlight.has(name);
+        return this.restartsInFlight.has(name) || this.kiroMigrationRuns?.has(name) === true;
     }
     /** InstanceLifecycleContext: an explicit wake joins the restart in flight. */
     restartInFlight(name) {
@@ -9948,6 +10152,10 @@ export class FleetManager {
             }))
                 return;
         }
+        // #2675: a reply to a posted question card is its typed answer (judged by who may talk to that instance), not a
+        // message for the instance — which could not take one while its card is up anyway.
+        if (await this.takeRemoteCardReply(msg))
+            return;
         // Access control — classic channels are open to all, others require an allowed
         // user. This runs before the dedup claim, and is judged by the adapter that
         // owns the topic rather than the one that happened to receive the message:
@@ -11339,7 +11547,7 @@ export class FleetManager {
         if (!ipc || !fleetRequestId)
             return;
         const type = String(msg.type);
-        const responseType = isCanvasWorkerTool(type.replace(/^fleet_/, "")) || type === "fleet_office_view" || type === "fleet_office_set" ? "fleet_web_theme_response"
+        const responseType = isCanvasWorkerTool(type.replace(/^fleet_/, "")) || type === "fleet_office_view" || type === "fleet_office_set" || OFFICE_PACK_IPC.has(type) ? "fleet_web_theme_response"
             : type.startsWith("fleet_schedule_") ? "fleet_schedule_response"
                 : type.startsWith("fleet_decision_") ? "fleet_decision_response"
                     : type === "fleet_task" ? "fleet_task_response"
@@ -11394,7 +11602,10 @@ export class FleetManager {
             || type === "fleet_set_web_widget" || type === "fleet_remove_web_widget"
             || type === "fleet_set_web_ambient" || type === "fleet_clear_web_ambient"
             || type === "fleet_export_web_mod" || type === "fleet_propose_web_mod"
-            || type === "fleet_office_view" || type === "fleet_office_set") {
+            || type === "fleet_office_view" || type === "fleet_office_set"
+            // #2692: the skin packs (OFFICE_PACK_IPC), answered as web theme tools.
+            || type === "fleet_office_pack_check" || type === "fleet_office_pack_upload" || type === "fleet_office_pack_delete"
+            || type === "fleet_office_pack_restore" || type === "fleet_office_pack_list" || type === "fleet_office_set_style") {
             this.handleWebTheme(name, msg);
             return;
         }
@@ -11416,7 +11627,8 @@ export class FleetManager {
                 ? this.appearanceTools.handle(instanceName, tool, args)
                 : tool === "export_web_mod" || tool === "propose_web_mod" ? this.agentMods.handle(instanceName, tool, args)
                     : tool === "office_view" || tool === "office_set" ? this.officeActs.handle(instanceName, tool, args)
-                        : this.webAppearance.handleTool(instanceName, tool, args);
+                        : OFFICE_PACK_IPC.has(`fleet_${tool}`) ? this.officePackTools.handle(instanceName, tool, args)
+                            : this.webAppearance.handleTool(instanceName, tool, args);
             ipc.send({ type: "fleet_web_theme_response", fleetRequestId, result });
         }
         catch (err) {
@@ -11854,6 +12066,8 @@ export class FleetManager {
             return this.agentMods.handle(instance, tool, args);
         if (tool === "office_view" || tool === "office_set")
             return this.officeActs.handle(instance, tool, args); // #2578
+        if (OFFICE_PACK_IPC.has(`fleet_${tool}`))
+            return this.officePackTools.handle(instance, tool, args); // #2692
         return this.webAppearance.handleTool(instance, tool, args);
     }
     async handlePreviewEmojisHttp(instance, args) {
@@ -12292,12 +12506,21 @@ export class FleetManager {
         normalizeOfficeStorage(this.fleetConfig);
         explicitPatches = explicitPatches.flatMap(patch => {
             const path = patch.path;
-            if (path.at(-2) === "dashboard" && path.at(-1) === "office" && !patch.remove) {
-                return [{ ...patch, path: [...path.slice(0, -2), "office_access"] }, { path, remove: true }];
-            }
-            if (path.at(-1) === "dashboard" && patch.value && typeof patch.value === "object" && Object.hasOwn(patch.value, "office")) {
-                const { office, ...dashboard } = patch.value;
-                return [{ ...patch, value: dashboard }, { path: [...path.slice(0, -1), "office_access"], value: office, remove: office === null }];
+            // #2601 (and #2692's office_packs): a separately kept feature is written under its own key, never in `dashboard`.
+            const separate = path.at(-2) === "dashboard" ? SEPARATE_FEATURE_KEYS[path.at(-1)] : undefined;
+            if (separate && !patch.remove) {
+                return [{ ...patch, path: [...path.slice(0, -2), separate] }, { path, remove: true }];
+            }
+            if (path.at(-1) === "dashboard" && patch.value && typeof patch.value === "object" && Object.keys(SEPARATE_FEATURE_KEYS).some(f => Object.hasOwn(patch.value, f))) {
+                const dashboard = { ...patch.value }, moved = [];
+                for (const [feature, key] of Object.entries(SEPARATE_FEATURE_KEYS)) {
+                    if (!Object.hasOwn(dashboard, feature))
+                        continue;
+                    const value = dashboard[feature];
+                    delete dashboard[feature];
+                    moved.push({ path: [...path.slice(0, -1), key], value, remove: value === null });
+                }
+                return [{ ...patch, value: dashboard }, ...moved];
             }
             // #2581's DM choice was withdrawn: an old string is just "on", posted in the topic, and its route is dropped.
             if (patch.path.join(".") === "web.notify_login" && patch.value === "dm")
@@ -12411,11 +12634,11 @@ export class FleetManager {
             const previous = daemon.getConfigSnapshot?.();
             if (!next || !previous)
                 continue;
-            if (isDeepStrictEqual(previous.dashboard, next.dashboard) && previous.office_access === next.office_access)
+            if (isDeepStrictEqual(previous.dashboard, next.dashboard) && previous.office_access === next.office_access && previous.office_pack_access === next.office_pack_access)
                 continue;
             // Only permissions are adopted here. Cold fields retain the live daemon's old snapshot, so reconcile still
             // detects that they require a restart. MCP menus also watch the raw file; this updates the next spawn's env.
-            daemon.applyConfigUpdate({ dashboard: next.dashboard ?? null, office_access: next.office_access ?? null });
+            daemon.applyConfigUpdate({ dashboard: next.dashboard ?? null, office_access: next.office_access ?? null, office_pack_access: next.office_pack_access ?? null });
             if (taskBoardSwitchedOn(previous.dashboard, next.dashboard)) {
                 this.admitTaskBoardNotice(name, TASK_BOARD_ON_NOTICE, `task-board-on:${name}:${Date.now()}`);
             }
@@ -12480,11 +12703,13 @@ export class FleetManager {
             const patches = [];
             const raw = this.rawFleetConfig;
             for (const [path, item] of [[["defaults"], raw.defaults], ...Object.entries(raw.instances ?? {}).map(([name, value]) => [["instances", name], value])]) {
-                if (!item?.dashboard || !Object.hasOwn(item.dashboard, "office"))
-                    continue;
-                patches.push({ path: [...path, "dashboard", "office"], remove: true });
-                if (!Object.hasOwn(item, "office_access") && typeof item.dashboard.office === "boolean")
-                    patches.push({ path: [...path, "office_access"], value: item.dashboard.office });
+                for (const [feature, key] of Object.entries(SEPARATE_FEATURE_KEYS)) {
+                    if (!item?.dashboard || !Object.hasOwn(item.dashboard, feature))
+                        continue;
+                    patches.push({ path: [...path, "dashboard", feature], remove: true });
+                    if (!Object.hasOwn(item, key) && typeof item.dashboard[feature] === "boolean")
+                        patches.push({ path: [...path, key], value: item.dashboard[feature] });
+                }
             }
             this.saveFleetConfig(patches);
             this.logger.info("Stored Office access outside dashboard for downgrade compatibility");
@@ -12719,6 +12944,7 @@ export class FleetManager {
             this.mods.forgetInstance(name);
             this.agentMods.forget(name);
             this.officeActsInstance?.forget(name);
+            this.officePackToolsInstance?.forget(name);
         }
         catch (err) {
             this.logger.warn({ err: err.message, name }, "Dropping a removed instance's web theme failed");
@@ -14350,7 +14576,7 @@ export class FleetManager {
                 entry.web = {
                     text: web.text,
                     ...(links ? { links } : {}),
-                    actions: opts.choices.map(c => ({ id: c.action, label: c.label })),
+                    actions: [...opts.choices.map(c => ({ id: c.action, label: c.label })), ...(opts.webInput ? [{ id: opts.webInput.action, label: opts.webInput.label, input: true }] : [])],
                     expiresAt: Date.now() + (opts.timeoutMs ?? NONCE_BUTTON_TIMEOUT_MS),
                 };
                 this.emitSseEvent("prompt", { instance: entry.instanceName, nonce, ...entry.web });
@@ -14527,6 +14753,8 @@ export class FleetManager {
             return true;
         if (await this.handleKiroMigrateCallback(data, adapterId, adapter))
             return true;
+        if (await this.handleOfficePackCallback(data, adapterId, adapter))
+            return true;
         if (await this.handleDashboardCallback(data, adapterId, adapter))
             return true;
         if (await this.handleClassicApproval(data, adapterId, adapter))
@@ -14543,6 +14771,8 @@ export class FleetManager {
             return true;
         if (await this.handleInteractivePromptAssist(data, adapterId, adapter))
             return true;
+        if (await this.handleRemoteCardClick(data, adapterId, adapter))
+            return true;
         if (await this.handleClassicBackendSelection(data))
             return true;
         if (await this.handleModelSelection(data, adapterId))
@@ -15016,8 +15246,12 @@ export class FleetManager {
         const buttons = this.replyButtons();
         return buttons ? buttons.clickWeb(instance, id, index, voter) : Promise.resolve({ status: 409, error: t("reply_buttons.closed") });
     }
-    async clickWebPrompt(instance, nonce, action) {
-        if (!/^[0-9a-f]{32}$/.test(nonce) || !/^[a-z][a-z-]{0,23}$/.test(action))
+    async clickWebPrompt(instance, nonce, action, text) {
+        if (!/^[0-9a-f]{32}$/.test(nonce) || !/^[a-z][a-z0-9-]{0,23}$/.test(action))
+            return { status: 400, error: "Malformed prompt answer" };
+        // #2675: only an action the page shows a text box for takes text, and it must say something.
+        const input = this.pendingNonceButtons.get(nonce)?.web?.actions.find(a => a.id === action)?.input === true;
+        if (input !== (text !== undefined) || (input && (!text.trim() || text.length > REMOTE_CARD_TEXT_MAX)))
             return { status: 400, error: "Malformed prompt answer" };
         const entry = this.pendingNonceButtons.get(nonce);
         // Unknown is the same answer as answered or expired: the page drops the buttons either way.
@@ -15039,6 +15273,8 @@ export class FleetManager {
                 notice = n; },
         };
         this.webPromptClicks.add(data);
+        if (text !== undefined)
+            this.webPromptTexts.set(data, text);
         await this.dispatchAdapterCallback(data, entry.adapterId, entry.adapter);
         if (this.webPromptClaims.has(data))
             return { status: 200 };
@@ -16096,6 +16332,163 @@ export class FleetManager {
         }
         return true;
     }
+    // ── #2675: a card a CLI shows in place of its composer, answered from the chat ─────────────────────────────────
+    /**
+     * Where an instance's card is put to people: its own place — its topic, or its ClassicBot room — or, on a fleet with
+     * no chat platform, the dashboard. Never General: the answer is the instance's conversation.
+     */
+    remoteCardPlace(instanceName) {
+        const web = this.webOnlyPromptPlace();
+        if (web)
+            return web;
+        const room = this.classicChannels?.getChannelIdByInstance(instanceName);
+        if (room) {
+            const adapterId = this.classicChannels?.getAdapterIdByInstance(instanceName) ?? this.getPrimaryAdapterId();
+            const adapter = adapterId ? this.worlds.get(adapterId)?.adapter : undefined;
+            return adapter && adapterId ? { adapter, adapterId, chatId: room } : null;
+        }
+        const adapterId = this.getInstanceAdapterId(instanceName);
+        const adapter = adapterId ? this.worlds.get(adapterId)?.adapter : undefined;
+        const chatId = this.getGroupIdForInstance(instanceName);
+        const topicId = this.fleetConfig?.instances[instanceName]?.topic_id;
+        if (!adapter || !adapterId || !chatId || topicId == null)
+            return null;
+        return { adapter, adapterId, chatId, threadId: String(topicId) };
+    }
+    /**
+     * The daemon saw a card held still on `instanceName`'s screen (remote_card): put it to the people who talk to that
+     * instance, with a button per answer. A card already posted for the instance is retired first (the daemon said it
+     * was gone; this is the fallback).
+     */
+    async postRemoteCard(instanceName, card) {
+        this.retireRemoteCard(instanceName, null, t("card.answered_in_pane"));
+        const place = this.remoteCardPlace(instanceName);
+        if (!place) {
+            this.logger.warn({ instanceName }, "A card is waiting on screen but the instance has no place to post it — the parked notice stands");
+            return;
+        }
+        const prompt = remoteCardPrompt(instanceName, card);
+        const nonce = await this.postNonceButtonPrompt({
+            prefix: REMOTE_CARD_CALLBACK_PREFIX, alertType: "interactive_prompt", instanceName, ...place,
+            message: prompt.message, choices: prompt.choices, webInput: prompt.webInput,
+            expiredText: t("card.expired", instanceName), timeoutMs: REMOTE_CARD_TIMEOUT_MS,
+            extra: { remoteCard: { identity: card.identity, kind: card.kind, options: card.kind === "question" ? card.options.map(o => ({ n: o.n, title: o.title })) : [] } },
+        });
+        if (nonce)
+            this.remoteCardPosts.set(instanceName, nonce);
+    }
+    /**
+     * The card is gone from the screen (remote_card_gone, `identity`; null: whichever is posted): its buttons collapse to
+     * `text` if nobody answered them here.
+     */
+    retireRemoteCard(instanceName, identity, text = t("card.answered_in_pane")) {
+        const nonce = this.remoteCardPosts.get(instanceName);
+        if (!nonce)
+            return;
+        const entry = this.pendingNonceButtons.get(nonce);
+        if (entry && identity !== null && entry.remoteCard?.identity !== identity)
+            return;
+        this.remoteCardPosts.delete(instanceName);
+        if (!entry)
+            return;
+        this.pendingNonceButtons.delete(nonce);
+        if (entry.timer)
+            clearTimeout(entry.timer);
+        void this.retireNonceButtons(entry, entry.messageId ?? "", text);
+    }
+    /** Who may answer an instance's card: whoever may already talk to it there (a ClassicBot room is open to all). */
+    mayAnswerRemoteCard(userId, entry) {
+        if (this.classicChannels?.getChannelIdByInstance(entry.instanceName) === entry.chatId)
+            return true;
+        const am = this.worlds.get(entry.adapterId)?.accessManager ?? this.accessManager;
+        return !am || am.isAllowed(userId);
+    }
+    /** A click on a card's button (platform or dashboard). */
+    async handleRemoteCardClick(data, callbackAdapterId, receivingAdapter) {
+        if (!data.callbackData.startsWith(REMOTE_CARD_CALLBACK_PREFIX))
+            return false;
+        // A typed answer from the dashboard must come with its text; refused before the claim, so the buttons stay.
+        const match = REMOTE_CARD_CALLBACK_RE.exec(data.callbackData);
+        if (match?.[2] === "text" && remoteCardAction("text", this.webPromptTexts.get(data)) === null) {
+            data.ack?.(t("buttons.stale_notice"));
+            return true;
+        }
+        const claimed = this.consumeNonceCallback(REMOTE_CARD_CALLBACK_PREFIX, REMOTE_CARD_CALLBACK_RE, data, callbackAdapterId, receivingAdapter, undefined, (userId, entry) => this.mayAnswerRemoteCard(userId, entry));
+        if (claimed === null)
+            return false;
+        if (claimed === "consumed")
+            return true;
+        const action = remoteCardAction(claimed.action, this.webPromptTexts.get(data));
+        const who = this.webPromptClicks.has(data) ? t("card.someone_on_dashboard") : (data.username ?? data.userId ?? "?");
+        await this.answerRemoteCardFor(claimed.entry, action, who, data.messageId, data.editClicked);
+        return true;
+    }
+    /**
+     * An inbound message that replies to a posted question card, by someone who may answer it: its text is the typed
+     * answer, and the message goes no further (true). Another bot's copy of a reply already taken is dropped (true).
+     */
+    async takeRemoteCardReply(msg) {
+        if (msg.isBotMessage || !msg.replyTo)
+            return false;
+        const now = performance.now();
+        for (const [key, until] of this.takenCardReplies)
+            if (until <= now)
+                this.takenCardReplies.delete(key);
+        const key = `${msg.chatId}|${msg.messageId}`;
+        if (this.takenCardReplies.has(key))
+            return true;
+        for (const [nonce, entry] of this.pendingNonceButtons) {
+            if (entry.prefix !== REMOTE_CARD_CALLBACK_PREFIX || entry.remoteCard?.kind !== "question")
+                continue;
+            // By place, whichever of the fleet's bots received the reply (a sibling's copy can arrive first, #2680 review), on
+            // the post's own platform; who may answer is judged by the post's world (mayAnswerRemoteCard), as Needs you does.
+            if (entry.chatId !== msg.chatId || entry.messageId !== msg.replyTo || entry.adapter.type !== msg.source)
+                continue;
+            if (!msg.userId || !this.mayAnswerRemoteCard(msg.userId, entry))
+                return false; // not theirs to answer: it is just a message
+            const action = remoteCardAction("text", msg.text ?? "");
+            if (!action)
+                return false;
+            this.pendingNonceButtons.delete(nonce);
+            if (entry.timer)
+                clearTimeout(entry.timer);
+            this.webPromptGone(entry);
+            this.takenCardReplies.set(key, now + REMOTE_CARD_TAKEN_TTL_MS);
+            await this.answerRemoteCardFor(entry, action, msg.username ?? msg.userId, entry.messageId ?? msg.replyTo);
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Key a claimed answer into the instance's card (the daemon checks it is still that card and walks a verified
+     * cursor), then collapse the post to what happened. When the card is still waiting and was not answered — refused
+     * or stopped part-way — it is posted again, so it can still be answered from here.
+     */
+    async answerRemoteCardFor(entry, action, who, messageId, editClicked) {
+        if (this.remoteCardPosts.get(entry.instanceName) === entry.nonce)
+            this.remoteCardPosts.delete(entry.instanceName);
+        const daemon = this.daemons.get(entry.instanceName);
+        const card = entry.remoteCard;
+        let outcome;
+        if (!card || !action)
+            outcome = { outcome: "refused", reason: "malformed" };
+        else if (!daemon?.answerRemoteCard)
+            outcome = { outcome: "stale" };
+        else {
+            try {
+                outcome = await daemon.answerRemoteCard(card.identity, action);
+            }
+            catch (err) {
+                this.logger.warn({ err: err?.message, instanceName: entry.instanceName }, "Answering a card from the chat failed");
+                outcome = { outcome: "stopped", step: "error" };
+            }
+        }
+        this.eventLog?.insert(entry.instanceName, "remote_card_answer", { action: action?.kind ?? null, outcome: outcome.outcome });
+        const choice = card && action ? remoteCardChoiceLabel(card, action) : "?";
+        await this.retireNonceButtons(entry, messageId, remoteCardOutcomeText(entry.instanceName, who, choice, outcome), editClicked);
+        if (outcome.outcome === "refused" || outcome.outcome === "stopped")
+            daemon?.repostRemoteCard?.();
+    }
     // ── Cancel button ────────────────────────────────────────────────────
     // Sent after delivering a user message to an instance; clicking it (or
     // /cancel) sends Escape to the instance's pane to interrupt generation.