@songsid/agend 2.1.12-beta.9 → 2.2.0-alpha.1

package/dist/host-memory.d.ts

@@ -4,6 +4,10 @@ export interface HostMemory {
     availableKind: "available" | "free" | "unknown";
     swapTotalBytes: number | null;
     swapFreeBytes: number | null;
+    /** Darwin kernel alarm, independent of the diagnostic RAM/swap estimates. */
+    darwinPressureLevel?: 1 | 2 | 4 | null;
+    /** Bounded diagnostic output; null when unavailable or not requested. */
+    darwinPressureRaw?: string | null;
 }
 interface HostMemoryDeps {
     platform: NodeJS.Platform;

package/dist/host-memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"host-memory.js","sourceRoot":"","sources":["../src/host-memory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"host-memory.js","sourceRoot":"","sources":["../src/host-memory.ts"],"names":[],"mappings":"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"}

package/dist/instance-config-impact.js

@@ -71,12 +71,17 @@ const INSTANCE_FIELDS = [
 const CLASSIC_FIELDS = [
     "backend", "model", "auto_pause_after", "tool_progress",
     "reply_completion_guard", "collab", "context_lines", "pre_task_command",
+    "web_echo",
 ];
 /**
  * Fleet-level fields, which no per-key rule can derive: they belong to the
  * fleet process or the channel binding rather than to an instance's config.
  */
 const FLEET_FIELD_IMPACTS = {
+    "web.echo_to_channel": "now",
+    "web.public_link.allow_public": "now",
+    "web.public_link.ttl_minutes": "now",
+    "web.public_link.protocol": "now",
     "defaults.locale": "now",
     "fleet.channels": "fleet",
     "fleet.channel.access.mode": "fleet",

package/dist/instance-config-impact.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-config-impact.js","sourceRoot":"","sources":["../src/instance-config-impact.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-config-impact.js","sourceRoot":"","sources":["../src/instance-config-impact.ts"],"names":[],"mappings":"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"}

package/dist/instance-lifecycle.d.ts

@@ -1,3 +1,4 @@
+import { SettingsExecution } from "./settings-transaction.js";
 import type { InstanceConfig, FleetConfig } from "./types.js";
 import { RoutingEngine } from "./routing-engine.js";
 import type { Logger } from "./logger.js";
@@ -45,6 +46,7 @@ export interface LifecycleContext {
     readonly fleetConfig: FleetConfig | null;
     readonly logger: Logger;
     readonly dataDir: string;
+    getSettingsConfigPath?(): string;
     readonly routing: RoutingEngine;
     readonly instanceIpcClients: Map<string, IpcClient>;
     readonly ipcStoppingInstances: Set<string>;
@@ -97,6 +99,8 @@ export interface LifecycleContext {
     notifyInstanceTopic(name: string, text: string): boolean | void;
     /** Notify the blocked instance and offer an interactive assist action in General. */
     notifyInteractivePrompt(name: string, kind: string): Promise<void>;
+    /** #1386: an instance's interaction observation, pause or wake changed ("Needs you" recomputes at once, not at its tick). */
+    onAttentionChanged?(name: string): void;
     /**
      * Offer a one-tap re-login beside an auth alert. Optional: contexts without
      * it (tests, lightweight fleets) still get the alert's written remedy.
@@ -159,6 +163,7 @@ export declare class SupersededStartError extends Error {
  * cross-instance idle gate (60s) plus a 60s grace.
  */
 export declare const PRECLAIM_LEASE_MS = 120000;
+type Daemon = InstanceType<typeof import("./daemon.js").Daemon>;
 /**
  * Working directories of the fleet's other instances on `backendName` (#984):
  * Codex consults them only to decide whether `resume --last` could take a
@@ -433,7 +438,7 @@ export declare class InstanceLifecycle {
      * never an auth-deferred or operator pause.
      */
     hasWorkLease(name: string, now?: number): boolean;
-    start(name: string, config: InstanceConfig, topicMode: boolean, runtimeIdentity?: FleetInstructionsParams["runtimeIdentity"], transition?: TransitionHandle): Promise<void>;
+    start(name: string, config: InstanceConfig, topicMode: boolean, runtimeIdentity?: FleetInstructionsParams["runtimeIdentity"], transition?: TransitionHandle, execution?: SettingsExecution, published?: (daemon: Daemon) => void): Promise<void>;
     private startInTransition;
     isPaused(name: string): boolean;
     getLastPausedAt(name: string): number | null;
@@ -452,16 +457,16 @@ export declare class InstanceLifecycle {
      * surface.
      */
     static startOrDispose(daemon: {
-        start(): Promise<void>;
+        start(admission?: () => void): Promise<void>;
         abortStartup(): Promise<void>;
-    }, name: string, logger: Logger): Promise<void>;
+    }, name: string, logger: Logger, admission?: () => void): Promise<void>;
     /** Stop the registered daemon only if it is still `daemon` (a concurrent restart may have replaced it). */
     stopIfCurrent(name: string, daemon: unknown): Promise<boolean>;
     stop(name: string, transition?: TransitionHandle): Promise<void>;
     private stopInTransition;
-    remove(name: string, authorization: ExplicitInstanceRemoval): Promise<void>;
+    remove(name: string, authorization: ExplicitInstanceRemoval, execution?: SettingsExecution, transition?: TransitionHandle): Promise<void>;
     /** Handle create_instance tool call from a daemon. */
-    handleCreate(args: LifecycleCreateArgs, respond: (result: unknown, error?: string) => void, adapterId?: string): Promise<void>;
+    handleCreate(args: LifecycleCreateArgs, respond: (result: unknown, error?: string) => void, adapterId?: string, execution?: SettingsExecution): Promise<void>;
     /** Handle delete_instance tool call from a daemon. */
     handleDelete(args: LifecycleDeleteArgs, respond: (result: unknown, error?: string) => void): Promise<void>;
     has(name: string): boolean;

package/dist/instance-lifecycle.js

@@ -1,6 +1,7 @@
+import { settingsUndo, undoSettingsPaths } from "./settings-transaction.js";
 import { measureSyncWork } from "./sync-work-attribution.js";
 import { REMOVED_BACKENDS, isRemovedBackend, removedBackendMessage } from "./backend/removed.js";
-import { existsSync, readFileSync, mkdirSync, realpathSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, mkdirSync, realpathSync, writeFileSync, statSync } from "node:fs";
 import { ensureInstanceDir } from "./private-dir.js";
 import { execFileSync } from "node:child_process";
 import { join, basename, dirname, resolve, sep as pathSep } from "node:path";
@@ -822,6 +823,7 @@ export class InstanceLifecycle {
             this.notifyIncident(name, "dialog_answer_ignored", text);
             this.ctx.notifyFleetError?.(t("fleet.dialog_answer_ignored", name, data.description, String(data.attempts)));
         }, this.ctx.logger, `daemon.dialog_answer_ignored[${name}]`));
+        daemon.on("instance_interaction", () => this.ctx.onAttentionChanged?.(name));
         daemon.on("interactive_prompt", safeHandler(async (data) => {
             this.ctx.eventLog?.insert(name, "interactive_prompt", { kind: data.kind });
             this.ctx.logger.warn({ name, kind: data.kind, prompt: data.prompt }, "Instance is waiting for interactive terminal input");
@@ -1159,11 +1161,14 @@ export class InstanceLifecycle {
             return false;
         return outbox.countForTarget(name, ["queued", "retry_wait"]) > 0;
     }
-    async start(name, config, topicMode, runtimeIdentity, transition) {
-        return this.runTransition(name, () => this.startInTransition(name, config, topicMode, runtimeIdentity), transition);
+    async start(name, config, topicMode, runtimeIdentity, transition, execution, published) {
+        return this.runTransition(name, () => this.startInTransition(name, config, topicMode, runtimeIdentity, execution, published), transition);
     }
-    async startInTransition(name, config, topicMode, runtimeIdentity) {
+    async startInTransition(name, config, topicMode, runtimeIdentity, execution, published) {
         const epoch = this.epochOf(name);
+        const check = () => { execution?.assert(); if (this.epochOf(name) !== epoch)
+            throw new SupersededStartError(name); };
+        check();
         const seedNow = this.activitySeedNow.delete(name);
         if (this.daemons.has(name)) {
             this.ctx.logger.info({ name }, "Instance already running, skipping");
@@ -1179,6 +1184,7 @@ export class InstanceLifecycle {
         // that fails before reaching the daemon must leave that intent intact.
         const { Daemon } = await import("./daemon.js");
         const { createBackend } = await import("./backend/factory.js");
+        check();
         const backendName = config.backend ?? this.ctx.fleetConfig?.defaults?.backend ?? "claude-code";
         // A removed backend (#1280): this instance refuses to start, says why and what to use instead, and the rest of
         // the fleet is unaffected. Never a fallback to another backend.
@@ -1258,7 +1264,7 @@ export class InstanceLifecycle {
                 throw new Error(message);
             }
         }
-        if (this.epochOf(name) !== epoch) {
+        if (this.epochOf(name) !== epoch || execution && !execution.current()) {
             // A stop/restart arrived while this start was reconciling: do not spawn.
             await daemon.abortStartup().catch(() => { });
             throw new SupersededStartError(name);
@@ -1267,16 +1273,17 @@ export class InstanceLifecycle {
         // before the handlers below exist and before this daemon is registered;
         // hold it and deliver it once both are true.
         daemon.holdStartupIncidents?.();
-        await InstanceLifecycle.startOrDispose(daemon, name, this.ctx.logger);
+        await InstanceLifecycle.startOrDispose(daemon, name, this.ctx.logger, execution ? check : undefined);
         // Publication fence (Phase 2a): the spawn cannot be cancelled, so a stop or
         // restart requested meanwhile has been waiting behind this transition. A
         // superseded start must not register, signal ready, or keep its window.
-        if (this.epochOf(name) !== epoch) {
+        if (this.epochOf(name) !== epoch || execution && !execution.current()) {
             await daemon.abortStartup().catch(err => this.ctx.logger.warn({ err, name }, "Failed to dispose a superseded start"));
             throw new SupersededStartError(name);
         }
         this.capacityBackoffBaselines.delete(name);
         this.daemons.set(name, daemon);
+        published?.(daemon); // Exact publication, synchronously after the ownership fence.
         if (seedNow)
             this.noteWokeForWork(name);
         this.ctx.onDaemonReady?.(name, daemon.bootId);
@@ -1287,8 +1294,10 @@ export class InstanceLifecycle {
             this.ctx.eventLog?.insert(name, "instance_paused", { reason: "idle", paused_at: data.pausedAt });
             this.ctx.logger.info({ name, pausedAt: data.pausedAt }, "Instance auto-paused after idle timeout");
             this.ctx.setTopicIcon(name, "remove");
+            this.ctx.onAttentionChanged?.(name);
         });
         daemon.on("auto_woke", () => {
+            this.ctx.onAttentionChanged?.(name);
             this.ctx.eventLog?.insert(name, "instance_resumed", { reason: "message" });
             this.ctx.logger.info({ name }, "Instance auto-woke for delivery");
             this.ctx.setTopicIcon(name, "green");
@@ -1349,6 +1358,7 @@ export class InstanceLifecycle {
             // its fleet-level statusline watcher in the frozen state.
             if (!daemon.isPaused)
                 this.ctx.startStatuslineWatcher(name);
+            this.ctx.onAttentionChanged?.(name);
         }
     }
     /** When `name` was last woken or (re)started for work, if recorded. */
@@ -1356,7 +1366,7 @@ export class InstanceLifecycle {
         return this.wokeAt.get(name);
     }
     async wake(name, timeoutMs = 30_000, transition, opts = {}) {
-        const woke = await this.wakeInner(name, timeoutMs, transition);
+        const woke = await this.wakeInner(name, timeoutMs, transition).finally(() => this.ctx.onAttentionChanged?.(name));
         // Only a successful operator/user wake lifts the coordinator's park.
         if (opts.source !== "coordinator")
             this.ctx.onExternalWake?.(name);
@@ -1418,9 +1428,12 @@ export class InstanceLifecycle {
      * rethrowing. The abort is best-effort — the start error is the one to
      * surface.
      */
-    static async startOrDispose(daemon, name, logger) {
+    static async startOrDispose(daemon, name, logger, admission) {
         try {
-            await daemon.start();
+            if (admission)
+                await daemon.start(admission);
+            else
+                await daemon.start();
         }
         catch (err) {
             await daemon.abortStartup().catch(abortErr => logger.warn({ err: abortErr, name }, "Failed to dispose a daemon whose start() rejected"));
@@ -1551,12 +1564,15 @@ export class InstanceLifecycle {
                 this.ctx.sessionRegistry.delete(session);
         }
     }
-    async remove(name, authorization) {
+    async remove(name, authorization, execution, transition) {
         // Automatic topology reconciliation must never reach the destructive path.
         assertExplicitInstanceRemoval(authorization);
         const config = this.ctx.fleetConfig?.instances[name];
         if (!config)
             return;
+        const check = () => { execution?.assert(); if (this.ctx.fleetConfig?.instances[name] !== config)
+            throw new Error("instance removal superseded"); };
+        check();
         // Never remove the General instance
         if (config.general_topic) {
             this.ctx.logger.warn({ name }, "Refusing to remove General instance");
@@ -1566,16 +1582,21 @@ export class InstanceLifecycle {
         // Access scheduler through fleetConfig — scheduler is managed by FleetManager
         // We just clean up instance-related data here
         // Stop daemon and clean up tmux window (handles both in-memory and orphaned cases)
-        await this.stop(name);
+        await this.stop(name, transition);
+        check();
         // Clean up backend config files (MCP config, instructions, etc.)
         // This is needed even when daemon is not in memory — stop() only calls
         // backend.cleanup() when daemon object exists. Without this, stale MCP
         // entries remain in the working directory and crash new instances.
-        if (config.working_directory && config.backend) {
+        // By the effective backend: an instance on the fleet default backend (no per-instance `backend`) has the same
+        // files to clean up (#906 review: an inherited kiro left its agent, steering and shared entry behind).
+        const effectiveBackend = config.backend ?? this.ctx.fleetConfig?.defaults?.backend;
+        if (config.working_directory && effectiveBackend) {
             try {
                 const { createBackend } = await import("./backend/factory.js");
+                check();
                 const instanceDir = this.ctx.getInstanceDir(name);
-                const backend = createBackend(config.backend, instanceDir);
+                const backend = createBackend(effectiveBackend, instanceDir);
                 if (backend?.cleanup) {
                     const backendConfig = {
                         workingDirectory: config.working_directory,
@@ -1593,6 +1614,15 @@ export class InstanceLifecycle {
                 this.ctx.logger.debug({ err, name }, "Backend cleanup failed (best effort)");
             }
         }
+        // State a backend keeps outside the instance directory (kiro: which conversations it owns, #906) — by the
+        // effective backend, so an instance on the fleet default is forgotten too.
+        try {
+            const { createBackend } = await import("./backend/factory.js");
+            check();
+            const effective = config.backend ?? this.ctx.fleetConfig?.defaults?.backend ?? "claude-code";
+            createBackend(effective, this.ctx.getInstanceDir(name))?.forget?.(name);
+        }
+        catch { /* best effort */ }
         // Clean up git worktree if applicable
         if (config.worktree_source && config.working_directory) {
             if (!existsSync(config.working_directory)) {
@@ -1602,20 +1632,24 @@ export class InstanceLifecycle {
                 try {
                     const { execFile: execFileCb } = await import("node:child_process");
                     const { promisify } = await import("node:util");
+                    check();
                     const execFileAsync = promisify(execFileCb);
                     await execFileAsync("git", ["worktree", "remove", "--force", config.working_directory], {
                         cwd: config.worktree_source,
                     });
+                    check();
                     this.ctx.logger.info({ worktree: config.working_directory }, "Removed git worktree");
                 }
                 catch {
-                    // worktree remove failed — directory exists but isn't a valid worktree.
+                    check(); // worktree remove failed — directory exists but isn't a valid worktree.
                     // Only rm if directory is in the expected location (sibling of source repo or under ~/.agend/).
                     const expectedParent = dirname(config.working_directory);
                     const sourceParent = dirname(config.worktree_source);
                     if (expectedParent === sourceParent || config.working_directory.startsWith(getAgendHome())) {
                         const { rm } = await import("node:fs/promises");
+                        check();
                         await rm(config.working_directory, { recursive: true, force: true });
+                        check();
                         this.ctx.logger.info({ worktree: config.working_directory }, "Removed orphaned worktree directory");
                     }
                     else {
@@ -1627,16 +1661,22 @@ export class InstanceLifecycle {
             try {
                 const { execFile: execFileCb } = await import("node:child_process");
                 const { promisify } = await import("node:util");
+                check();
                 const execFileAsync = promisify(execFileCb);
                 await execFileAsync("git", ["worktree", "prune"], { cwd: config.worktree_source });
             }
-            catch { /* best effort */ }
+            catch {
+                check(); /* best effort */
+            }
         }
+        check();
         // Clean up IPC
         const ipc = this.ctx.instanceIpcClients.get(name);
         if (ipc) {
             await ipc.close();
-            this.ctx.instanceIpcClients.delete(name);
+            check();
+            if (this.ctx.instanceIpcClients.get(name) === ipc)
+                this.ctx.instanceIpcClients.delete(name);
         }
         // Remove from routing table (this instance only: #1085, another Telegram
         // world may own the same topic number)
@@ -1644,13 +1684,20 @@ export class InstanceLifecycle {
             this.ctx.routing.unregister(config.topic_id, name);
         }
         // Remove from fleet config and save
-        delete this.ctx.fleetConfig.instances[name];
-        this.ctx.saveFleetConfig();
+        const persist = () => { delete this.ctx.fleetConfig.instances[name]; this.ctx.saveFleetConfig(); };
+        if (execution)
+            execution.mutate(persist);
+        else {
+            check();
+            persist();
+        }
         clearPausedMarker(this.ctx.getInstanceDir(name));
         this.ctx.logger.info({ name }, "Instance removed");
     }
     /** Handle create_instance tool call from a daemon. */
-    async handleCreate(args, respond, adapterId) {
+    async handleCreate(args, respond, adapterId, execution) {
+        const check = () => execution?.assert();
+        check();
         const rawDirectory = args.directory;
         const directory = rawDirectory ? rawDirectory.replace(/^~/, process.env.HOME || "~") : undefined;
         const topicName = args.topic_name || (directory ? basename(directory) : undefined);
@@ -1666,6 +1713,7 @@ export class InstanceLifecycle {
         if (directory) {
             try {
                 await access(directory);
+                check();
             }
             catch {
                 respond(null, `Directory does not exist: ${directory}`);
@@ -1723,6 +1771,36 @@ export class InstanceLifecycle {
         // If branch specified, create git worktree (requires directory)
         let workDir = directory ?? "";
         let worktreePath;
+        let acquiredWorktree = false;
+        let acquiredDirectory;
+        const directoryReferenced = () => Object.values(this.ctx.fleetConfig?.instances ?? {}).some(config => config.working_directory === workDir);
+        const cleanupDirectory = async () => {
+            if (!acquiredDirectory || !workDir || directoryReferenced())
+                return;
+            const ownsPath = () => {
+                if (directoryReferenced())
+                    return false;
+                try {
+                    const current = statSync(workDir);
+                    return current.dev === acquiredDirectory.dev && current.ino === acquiredDirectory.ino;
+                }
+                catch {
+                    return false;
+                }
+            };
+            if (acquiredWorktree) {
+                const { execFile } = await import("node:child_process");
+                const { promisify } = await import("node:util");
+                if (!ownsPath())
+                    return;
+                await promisify(execFile)("git", ["worktree", "remove", "--force", workDir], { cwd: directory });
+            }
+            else {
+                const { rm } = await import("node:fs/promises");
+                if (ownsPath())
+                    await rm(workDir, { recursive: true, force: true });
+            }
+        };
         if (branch && !directory) {
             respond(null, "directory is required when branch is specified");
             return;
@@ -1731,7 +1809,14 @@ export class InstanceLifecycle {
             try {
                 const { execFile: execFileCb } = await import("node:child_process");
                 const { promisify } = await import("node:util");
-                const execFileAsync = promisify(execFileCb);
+                const nativeExec = promisify(execFileCb);
+                const execFileAsync = async (file, args, options, acquired) => {
+                    check();
+                    const result = await nativeExec(file, args, options);
+                    acquired?.();
+                    check();
+                    return result;
+                };
                 await execFileAsync("git", ["rev-parse", "--git-dir"], { cwd: directory });
                 const customPath = args.worktree_path;
                 if (customPath) {
@@ -1767,23 +1852,25 @@ export class InstanceLifecycle {
                     respond(null, EMBEDDED_CREDENTIAL_REMOTE_REPAIR_FAILED);
                     return;
                 }
+                const acquired = () => { acquiredWorktree = true; workDir = worktreePath; acquiredDirectory = statSync(workDir); };
                 if (detach) {
-                    await execFileAsync("git", ["worktree", "add", "--detach", worktreePath, branch], { cwd: directory });
+                    await execFileAsync("git", ["worktree", "add", "--detach", worktreePath, branch], { cwd: directory }, acquired);
                 }
                 else if (branchExists) {
-                    await execFileAsync("git", ["worktree", "add", worktreePath, branch], { cwd: directory });
+                    await execFileAsync("git", ["worktree", "add", worktreePath, branch], { cwd: directory }, acquired);
                 }
                 else {
                     const startPoint = args.start_point;
                     const worktreeArgs = ["worktree", "add", worktreePath, "-b", branch];
                     if (startPoint)
                         worktreeArgs.push(startPoint);
-                    await execFileAsync("git", worktreeArgs, { cwd: directory });
+                    await execFileAsync("git", worktreeArgs, { cwd: directory }, acquired);
                 }
                 this.ctx.logger.info({ worktreePath, branch, repo: directory }, "Created git worktree for instance");
                 workDir = worktreePath;
             }
             catch (err) {
+                await cleanupDirectory().catch(e => this.ctx.logger.warn({ err: e }, "Owned worktree cleanup failed"));
                 respond(null, `Failed to create worktree: ${err.message}`);
                 return;
             }
@@ -1808,13 +1895,18 @@ export class InstanceLifecycle {
         // Sequential steps with rollback
         let createdTopicId;
         let newInstanceName;
+        let createdConfig;
+        let createdDaemon;
+        let createUndo = [];
         // Capture the creating world's delete capability BEFORE the create await:
         // rollback must use exactly this adapter even if the world is removed or
         // replaced while creating. Never re-resolve (that would substitute the
         // primary or a new world). Null means fail closed at rollback.
         const topicDeleter = this.ctx.getForumTopicDeleter?.(adapterId) ?? null;
         try {
+            check();
             createdTopicId = await this.ctx.createForumTopic(topicName, adapterId);
+            check();
             // Use explicit topic_name as name base when provided; fall back to directory basename
             const explicitTopicName = args.topic_name;
             const nameBase = explicitTopicName ?? (worktreePath ? topicName : (directory ? basename(workDir) : topicName));
@@ -1842,7 +1934,10 @@ export class InstanceLifecycle {
             // If no directory was provided, auto-create default workspace
             if (!directory) {
                 workDir = join(getAgendHome(), "workspaces", newInstanceName);
+                const existed = existsSync(workDir);
                 mkdirSync(workDir, { recursive: true });
+                if (!existed)
+                    acquiredDirectory = statSync(workDir);
                 ensureWorkspaceGit(workDir);
             }
             const instanceConfig = {
@@ -1872,11 +1967,31 @@ export class InstanceLifecycle {
                 && !isModelCompatible(instanceConfig.backend, instanceConfig.model)) {
                 delete instanceConfig.model;
             }
-            this.ctx.fleetConfig.instances[newInstanceName] = instanceConfig;
-            this.ctx.routing.register(createdTopicId, { kind: "instance", name: newInstanceName });
-            this.ctx.saveFleetConfig();
-            await this.start(newInstanceName, instanceConfig, true);
+            createdConfig = instanceConfig;
+            const beforeCreate = structuredClone(this.ctx.fleetConfig);
+            const persist = () => {
+                this.ctx.fleetConfig.instances[newInstanceName] = instanceConfig;
+                this.ctx.routing.register(createdTopicId, { kind: "instance", name: newInstanceName });
+                try {
+                    this.ctx.saveFleetConfig();
+                }
+                finally {
+                    createUndo = settingsUndo((this.ctx.getSettingsConfigPath?.() ?? join(this.ctx.dataDir, "fleet.yaml")), beforeCreate, this.ctx.fleetConfig, [["instances", newInstanceName]]);
+                }
+            };
+            if (execution)
+                execution.mutate(persist);
+            else
+                persist();
+            if (execution)
+                await this.start(newInstanceName, instanceConfig, true, undefined, undefined, execution);
+            else
+                await this.start(newInstanceName, instanceConfig, true);
+            createdDaemon = this.daemons.get(newInstanceName);
+            check();
             await this.ctx.connectIpcToInstance(newInstanceName);
+            check();
+            execution?.complete();
             respond({
                 success: true,
                 name: newInstanceName,
@@ -1886,16 +2001,20 @@ export class InstanceLifecycle {
         }
         catch (err) {
             // Rollback in reverse order
-            if (newInstanceName && this.daemons.has(newInstanceName)) {
+            if (newInstanceName && createdDaemon && this.daemons.get(newInstanceName) === createdDaemon) {
                 await this.stop(newInstanceName).catch(e => this.ctx.logger.error({ err: e, name: newInstanceName }, "Failed to stop instance during rollback"));
             }
-            if (newInstanceName && this.ctx.fleetConfig?.instances[newInstanceName]) {
-                delete this.ctx.fleetConfig.instances[newInstanceName];
-                if (createdTopicId)
-                    this.ctx.routing.unregister(createdTopicId, newInstanceName);
-                this.ctx.saveFleetConfig();
+            if (newInstanceName && createdConfig && this.ctx.fleetConfig?.instances[newInstanceName] === createdConfig && createUndo.length) {
+                const retained = undoSettingsPaths((this.ctx.getSettingsConfigPath?.() ?? join(this.ctx.dataDir, "fleet.yaml")), this.ctx.fleetConfig, createUndo);
+                if (!retained.conflicts) {
+                    this.ctx.fleetConfig.instances = retained.value.instances;
+                    if (createdTopicId && !this.ctx.fleetConfig.instances[newInstanceName])
+                        this.ctx.routing.unregister(createdTopicId, newInstanceName);
+                    this.ctx.saveFleetConfig();
+                }
             }
-            if (createdTopicId) {
+            const topicReferenced = createdTopicId != null && Object.values(this.ctx.fleetConfig?.instances ?? {}).some(config => String(config.topic_id) === String(createdTopicId) && (adapterId == null || config.channel_id == null || config.channel_id === adapterId));
+            if (createdTopicId && !topicReferenced) {
                 // Delete through the captured creating adapter only (#1305 P2-4/r4).
                 // If the world went away, fail closed: log and leave the topic for
                 // manual cleanup rather than deleting through a substituted adapter.
@@ -1911,24 +2030,7 @@ export class InstanceLifecycle {
                     this.ctx.logger.warn({ topicId: createdTopicId }, "Creating world has no delete capability; leaving topic for manual cleanup");
                 }
             }
-            if (worktreePath) {
-                try {
-                    const { execFile: execFileCb } = await import("node:child_process");
-                    const { promisify } = await import("node:util");
-                    const execFileAsync = promisify(execFileCb);
-                    await execFileAsync("git", ["worktree", "remove", "--force", worktreePath], { cwd: directory });
-                    await execFileAsync("git", ["worktree", "prune"], { cwd: directory });
-                }
-                catch { /* best-effort worktree cleanup */ }
-            }
-            else if (!directory && workDir) {
-                // Remove auto-created workspace directory
-                try {
-                    const { rm } = await import("node:fs/promises");
-                    await rm(workDir, { recursive: true, force: true });
-                }
-                catch { /* best-effort cleanup */ }
-            }
+            await cleanupDirectory().catch(e => this.ctx.logger.warn({ err: e }, "Owned instance directory cleanup failed"));
             respond(null, `Failed to create instance: ${err.message}`);
         }
     }
@@ -1992,6 +2094,13 @@ export class InstanceLifecycle {
         this.ctx.saveFleetConfig();
         // 5. Clean instanceDir to avoid stale rotation-state.json / crash-history
         const instanceDir = this.ctx.getInstanceDir(instanceName);
+        // The replacement starts a fresh context: forget the conversations the old one owned (kiro, #906).
+        try {
+            const { createBackend } = await import("./backend/factory.js");
+            const effective = savedConfig.backend ?? this.ctx.fleetConfig?.defaults?.backend ?? "claude-code";
+            createBackend(effective, instanceDir)?.forget?.(instanceName);
+        }
+        catch { /* best effort */ }
         try {
             const { rm } = await import("node:fs/promises");
             await rm(instanceDir, { recursive: true, force: true });