@songsid/agend 2.3.2-beta.14 → 2.3.2-beta.15

package/dist/fleet-manager.d.ts

@@ -464,6 +464,7 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private pendingNonceButtons;
     /** #2598 B2: the kiro moves waiting on a fleet admin's Confirm in General, by prompt nonce. */
     private pendingKiroMigrations;
+    private pendingKiroReconciliations;
     private kiroMigrationRuns;
     /** #1386 "Needs you": the list, its live chat messages and Acknowledge. Started with the fleet (finishStartup). */
     private needsYou;
@@ -827,6 +828,13 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     }>;
     /** A fleet admin's Confirm or Cancel on a kiro move. Any fleet admin (the default nonce authorization), in General. */
     private handleKiroMigrateCallback;
+    private kiroReconcileDeps;
+    requestKiroReconciliation(name: string, keep: string, archive: string, rollbackReceipt?: string): Promise<{
+        ok: boolean;
+        text?: string;
+        error?: string;
+    }>;
+    private handleKiroReconcileCallback;
     private handleSettingsChangeCallback;
     startSettingsConfirmationControl(): Promise<void>;
     private get webToken();
@@ -1476,7 +1484,7 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
      */
     resumePaused?: boolean, 
     /** Phase 2a: the caller's transition, for a start made from inside a restart or wake. */
-    transition?: TransitionHandle, execution?: SettingsExecution): Promise<void>;
+    transition?: TransitionHandle, execution?: SettingsExecution, kiroMigration?: symbol): Promise<void>;
     /** A boot's observation cannot settle a replacement boot or a newer attempt of the same instance. */
     private trackStartupInstance;
     private publishStartupStatus;

package/dist/fleet-manager.js

@@ -28,7 +28,7 @@ import { PUBLIC_PREVIEW_FRAME_SRC, PUBLIC_PREVIEW_TUNNEL_DIR, PublicPreview, pub
 import { CloudflaredProvider } from "./tunnel/cloudflared.js";
 import { ensureCloudflared } from "./tunnel/cloudflared-install.js";
 import { OFFICE_SHARE_TUNNEL_DIR, OfficeShareService } from "./office-share-service.js";
-import { ALL_OFFICES } from "./office-share.js";
+import { ALL_OFFICES, WHOLE_FLEET } from "./office-share.js";
 import { TunnelPurposeLane } from "./tunnel/purpose-lane.js";
 import { ManagedTunnel } from "./tunnel/manager.js";
 import { withinBudget } from "./monotonic-budget.js";
@@ -47,6 +47,7 @@ import { join, dirname, basename, delimiter, isAbsolute, relative, resolve as re
 import { fileURLToPath } from "node:url";
 import { isDeepStrictEqual } from "node:util";
 import { getAgendHome, ensureWorkspaceGit } from "./paths.js";
+import { planKiroReconciliation, applyKiroReconciliation, kiroReconciliationPrompt } from "./kiro-reconcile.js";
 import { applyKiroMigration, kiroMigrationPrompt, planKiroMigration } from "./kiro-migrate.js";
 import { fleetLabel } from "./fleet-label.js";
 import { beginFullRestartProgress as persistFullRestartProgress, beginUpdateProgress as persistUpdateProgress, clearUpdateMarker, isUpdateInProgress, readUpdateProgress, sameUpdateMarker, setUpdateProgressStage, updateMarkerIdentity, updateProgressOperation, updateReceiptOf, } from "./update-marker.js";
@@ -254,7 +255,7 @@ import { manualCleanupMessage, reapStaleTunnel } from "./tunnel/lease.js";
 import { buildToolPermissionsNotice } from "./tool-permissions-notice.js";
 import { NeedsYouHub } from "./needs-you-hub.js";
 import { WEB_CHAT_NOTICE, claimNotice, hasWebChat, releaseNotice, upgradeNoticesPath } from "./upgrade-notices.js";
-import { GENERAL_PAUSE_ERROR, isGeneralInstance } from "./general-instance.js";
+import { GENERAL_NAME, GENERAL_PAUSE_ERROR, adoptGeneralByName, freeGeneralName, isGeneralInstance } from "./general-instance.js";
 import { buildOrgChart } from "./web-org.js";
 import { topMemoryHogs } from "./memory-hogs.js";
 import { GENERAL_POINTING_REFUSALS, SNOWFLAKE, hasPlaceRefs, placeRef, webRoute, webTextLinks, placeSuffix, renderPlaceRefs, stripPlaceRefs, topicUrl, worldPlaceOf } from "./topic-link.js";
@@ -499,6 +500,7 @@ 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:";
+const KIRO_RECONCILE_CALLBACK_PREFIX = "kiro-reconcile:";
 /** #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). */
@@ -931,6 +933,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();
+    pendingKiroReconciliations = new Map();
     kiroMigrationRuns = new Map();
     /** #1386 "Needs you": the list, its live chat messages and Acknowledge. Started with the fleet (finishStartup). */
     needsYou = null;
@@ -1236,7 +1239,7 @@ export class FleetManager {
      * `share` null with `count`: "Revoke all".
      */
     officeShareNotice(event, who, share, count) {
-        const office = !share ? "" : share.office === ALL_OFFICES ? t("office_share.all") : this.officeStore.list().offices.find(o => o.id === share.office)?.name ?? share.office;
+        const office = !share ? "" : share.office === ALL_OFFICES ? t("office_share.all") : share.office === WHOLE_FLEET ? t("office_share.whole") : this.officeStore.list().offices.find(o => o.id === share.office)?.name ?? share.office;
         const minutes = share ? Math.round((share.expiresAt - share.createdAt) / 60_000) : 0;
         const text = event === "created" ? t("office_share.created_notice", who, office, minutes < 60 ? `${minutes} min` : `${Math.round(minutes / 60)} h`)
             : share ? t("office_share.revoked_notice", who, office) : t("office_share.revoked_all_notice", who, count);
@@ -2065,6 +2068,76 @@ export class FleetManager {
         this.notifyInstanceTopic(plan.name, outcome.text);
         return true;
     }
+    kiroReconcileDeps() {
+        return { ...this.kiroMigrateDeps(), store: async (input, plan, actor, rollbackReceipt) => {
+                const reply = await sharedKiroV2StoreLane.read({ keys: [], sessionsDir: input.sessionsDir, reconciliation: { input, plan, actor, rollbackReceipt } });
+                if (reply.kind !== "ok" || !reply.reconciliation)
+                    throw new Error(reply.kind === "unreadable" ? reply.detail : t("kiro_reconcile.changed"));
+                return reply.reconciliation;
+            } };
+    }
+    async requestKiroReconciliation(name, keep, archive, rollbackReceipt) {
+        try {
+            if (!this.eventLog)
+                return { ok: false, error: t("kiro_reconcile.audit_failed") };
+            const plan = await planKiroReconciliation(this.kiroReconcileDeps(), name, keep, archive, rollbackReceipt);
+            const general = this.findGeneralInstance(), adapterId = general ? this.getInstanceAdapterId(general) : undefined;
+            const adapter = general ? this.getAdapterForInstance(general) : undefined, chatId = general ? this.getGroupIdForInstance(general) : undefined;
+            const topic = general ? String(this.fleetConfig?.instances[general]?.topic_id ?? "") : "";
+            if (!general || !adapterId || !adapter || !chatId)
+                return { ok: false, error: t("kiro_migrate.no_general") };
+            const nonce = await this.postNonceButtonPromptOrThrow({ prefix: KIRO_RECONCILE_CALLBACK_PREFIX, alertType: "clear_confirm", instanceName: name,
+                adapter, adapterId, chatId, ...(topic ? { threadId: topic } : {}), message: kiroReconciliationPrompt(plan),
+                choices: [{ action: "confirm", label: t("kiro_migrate.confirm_button") }, { action: "cancel", label: t("kiro_migrate.cancel_button") }],
+                expiredText: t("kiro_migrate.expired", name), timeoutMs: KIRO_MIGRATE_TIMEOUT_MS });
+            this.pendingKiroReconciliations.set(nonce, plan);
+            setTimeout(() => this.pendingKiroReconciliations.delete(nonce), KIRO_MIGRATE_TIMEOUT_MS + 60_000).unref?.();
+            this.eventLog?.insert(name, "kiro_reconcile", { phase: "requested", keep, archive, rollbackReceipt, message: kiroReconciliationPrompt(plan) });
+            return { ok: true, text: t("kiro_migrate.requested") };
+        }
+        catch (error) {
+            return { ok: false, error: error instanceof SyntaxError ? "Malformed reconciliation data" : error.message };
+        }
+    }
+    async handleKiroReconcileCallback(data, adapterId, adapter) {
+        const claimed = this.consumeNonceCallback(KIRO_RECONCILE_CALLBACK_PREFIX, /^kiro-reconcile:([0-9a-f]{32}):(confirm|cancel)$/, data, adapterId, adapter);
+        if (claimed === null)
+            return false;
+        if (claimed === "consumed")
+            return true;
+        const { entry, action } = claimed;
+        const nonce = data.callbackData.slice(KIRO_RECONCILE_CALLBACK_PREFIX.length, KIRO_RECONCILE_CALLBACK_PREFIX.length + 32);
+        const plan = this.pendingKiroReconciliations.get(nonce);
+        this.pendingKiroReconciliations.delete(nonce);
+        if (action === "cancel" || !plan) {
+            await this.retireNonceButtons(entry, entry.messageId ?? data.messageId, t(plan ? "kiro_migrate.cancelled" : "kiro_migrate.expired", entry.instanceName));
+            this.eventLog?.insert(entry.instanceName, "kiro_reconcile", { phase: "cancelled_or_expired", userId: data.userId });
+            return true;
+        }
+        let outcome;
+        try {
+            if (!this.eventLog)
+                throw new Error(t("kiro_reconcile.audit_failed"));
+            this.eventLog.insert(plan.name, "kiro_reconcile", { phase: "confirmed", userId: data.userId, keep: plan.input.sessionId, archive: plan.input.archiveId });
+        }
+        catch {
+            await this.retireNonceButtons(entry, entry.messageId ?? data.messageId, t("kiro_reconcile.audit_failed"));
+            this.notifyFleetError(t("kiro_reconcile.audit_failed"));
+            return true;
+        }
+        await this.retireNonceButtons(entry, entry.messageId ?? data.messageId, t("kiro_migrate.applying", plan.name));
+        outcome = await applyKiroReconciliation(this.kiroReconcileDeps(), plan, `${adapterId}:${data.userId}`);
+        try {
+            this.eventLog.insert(plan.name, "kiro_reconcile", { phase: outcome.ok ? "completed" : "failed", userId: data.userId, receipt: outcome.receipt, message: outcome.text });
+        }
+        catch {
+            this.logger.error({ name: plan.name, receipt: outcome.receipt }, "Kiro reconciliation final Log entry failed; confirmed intent remains in the audit and archive");
+        }
+        this.logger.info({ name: plan.name, ok: outcome.ok, receipt: outcome.receipt }, "Kiro explicit reconciliation");
+        this.notifyFleetError(outcome.text);
+        this.notifyInstanceTopic(plan.name, outcome.text);
+        return true;
+    }
     async handleSettingsChangeCallback(data, adapterId, adapter) {
         const result = this.consumeNonceCallback("settings-confirm:", /^settings-confirm:([0-9a-f]{32}):(confirm|reject)$/, data, adapterId, adapter, undefined, (userId, entry) => entry.confirmationAdmin?.(userId) === true);
         if (!result)
@@ -5642,7 +5715,10 @@ export class FleetManager {
      */
     resumePaused = false, 
     /** Phase 2a: the caller's transition, for a start made from inside a restart or wake. */
-    transition, execution) {
+    transition, execution, kiroMigration) {
+        const migration = this.kiroMigrationRuns?.get(name);
+        if (migration && migration.token !== kiroMigration)
+            throw new Error(t("kiro_migrate.in_progress"));
         execution?.assert();
         if (this.sessionOomStopped(name)) {
             if (resumePaused)
@@ -6510,7 +6586,8 @@ export class FleetManager {
                 return { backend, profile: credentialHomeSpec(backend) ? instanceCredentialProfile(config, this.fleetConfig?.defaults, backend) : null };
             });
             const topicMode = this.fleetConfig?.channel?.mode === "topic";
-            await this.startAfterRestart(name, wasPaused, pausedAt, pauseReason, () => this.startInstance(name, config, topicMode ?? false, "fleet-topic", false, transition));
+            await this.startAfterRestart(name, wasPaused, pausedAt, pauseReason, () => opts?.kiroMigration ? this.startInstance(name, config, topicMode ?? false, "fleet-topic", false, transition, undefined, opts.kiroMigration)
+                : this.startInstance(name, config, topicMode ?? false, "fleet-topic", false, transition));
             this.stormWindow.markRecovered(name);
             return;
         }
@@ -8304,8 +8381,8 @@ export class FleetManager {
         const channelConfigs = fleet.channels ?? (fleet.channel ? [fleet.channel] : []);
         this.warnUnboundGeneralChannelIds(fleet);
         const primaryAdapterId = channelConfigs[0] ? (channelConfigs[0].id ?? channelConfigs[0].type) : undefined;
+        let generalsCreated = adoptGeneralByName(fleet, this.logger, dir => insideManagedWorkspaces(dir) || resolvePath(dir) === join(getAgendHome(), GENERAL_NAME));
         const generalInstances = Object.entries(fleet.instances).filter(([, inst]) => inst.general_topic === true);
-        let generalsCreated = false;
         // Collect unbound generals (no channel_id set) for auto-assignment
         const unboundGenerals = generalInstances.filter(([, inst]) => !inst.channel_id);
         // Track which adapters still need a general
@@ -8365,9 +8442,16 @@ export class FleetManager {
         }
         // Phase 3: Create new generals for any remaining adapters
         for (const need of needsGeneral) {
-            const name = channelConfigs.length > 1 ? `general-${need.adapterId}` : "general";
-            if (fleet.instances[name])
+            let name = channelConfigs.length > 1 ? `general-${need.adapterId}` : GENERAL_NAME;
+            if (fleet.instances[name]?.general_topic)
                 continue;
+            if (fleet.instances[name]) {
+                // M-2069: the name is an agent's that is not the General (adoptGeneralByName left it: it works in a project
+                // of the user's) — the fleet still gets its General, under a free name, never none.
+                const taken = name;
+                name = freeGeneralName(fleet.instances, taken);
+                this.logger.warn({ taken, name }, "An agent is named like the General but is not one — creating the General under a free name; rename that agent to clear this");
+            }
             this.logger.warn({ adapter: need.adapterId, name }, "No general instance for adapter — auto-creating");
             const generalDir = join(getAgendHome(), name);
             mkdirSync(generalDir, { recursive: true, mode: 0o700 });
@@ -14758,6 +14842,8 @@ export class FleetManager {
             return true;
         if (await this.handleKiroMigrateCallback(data, adapterId, adapter))
             return true;
+        if (await this.handleKiroReconcileCallback(data, adapterId, adapter))
+            return true;
         if (await this.handleOfficePackCallback(data, adapterId, adapter))
             return true;
         if (await this.handleDashboardCallback(data, adapterId, adapter))