pilotswarm 0.5.63 → 0.5.64

package/mcp/dist/src/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA0BlD,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,SAAS,CA4G7D"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA2BlD,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,SAAS,CA6G7D"}

package/mcp/dist/src/server.js

@@ -5,6 +5,7 @@ import { registerAgentTools } from "./tools/agents.js";
 import { registerFactsTools } from "./tools/facts.js";
 import { registerModelTools } from "./tools/models.js";
 import { registerProviderTools } from "./tools/providers.js";
+import { registerFeatureTools } from "./tools/features.js";
 import { registerCapabilityTools } from "./tools/capabilities.js";
 import { registerEnhancedFactTools } from "./tools/facts-enhanced.js";
 import { registerGraphTools } from "./tools/graph.js";
@@ -78,6 +79,7 @@ export function createMcpServer(ctx) {
     registerFactsTools(server, ctx);
     registerModelTools(server, ctx);
     registerProviderTools(server, ctx);
+    registerFeatureTools(server, ctx);
     registerCapabilityTools(server, ctx);
     registerTurnControlTools(server, ctx);
     registerGroupTools(server, ctx);

package/mcp/dist/src/server.js.map

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

package/mcp/dist/src/tools/features.d.ts

@@ -0,0 +1,4 @@
+import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { ServerContext } from "../context.js";
+export declare function registerFeatureTools(server: McpServer, ctx: ServerContext): void;
+//# sourceMappingURL=features.d.ts.map

package/mcp/dist/src/tools/features.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"features.d.ts","sourceRoot":"","sources":["../../../src/tools/features.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,QA8BzE"}

package/mcp/dist/src/tools/features.js

@@ -0,0 +1,35 @@
+import { z } from "zod";
+import { FEATURE_OPERATION_SPECS, featureToolParameters } from "pilotswarm-sdk";
+import { jsonResult, withToolErrors } from "../util/respond.js";
+export function registerFeatureTools(server, ctx) {
+    // Web mode ignores this value and derives identity from authentication.
+    // Direct mode requires an explicitly configured identity/admin grant for
+    // feature policy; holding a catalog handle alone does not opt it in.
+    const provider = process.env.PILOTSWARM_MCP_ACTOR_PROVIDER;
+    const subject = process.env.PILOTSWARM_MCP_ACTOR_SUBJECT;
+    const viewer = {
+        principal: provider && subject ? { provider, subject } : null,
+        isAdmin: !ctx.webMode && ctx.admin && process.env.PILOTSWARM_MCP_FEATURE_ADMIN === "true",
+    };
+    for (const spec of FEATURE_OPERATION_SPECS) {
+        const schema = featureToolParameters(spec);
+        const inputSchema = {};
+        for (const [key, property] of Object.entries(schema.properties)) {
+            let field = property.type === "boolean" ? z.boolean()
+                : property.type === "integer" ? z.number().int().min(property.minimum ?? 0).max(property.maximum ?? Number.MAX_SAFE_INTEGER)
+                    : z.string().min(property.minLength ?? 0).max(property.maxLength ?? 1024);
+            if (property.description)
+                field = field.describe(property.description);
+            inputSchema[key] = schema.required.includes(key) ? field : field.optional();
+        }
+        server.registerTool(spec.name, { title: spec.name.replaceAll("_", " "), description: spec.description, inputSchema }, withToolErrors(async (args) => {
+            const method = ctx.mgmt[spec.method].bind(ctx.mgmt);
+            const values = spec.kind === "audit" ? [args.limit]
+                : spec.kind === "users" ? [args.query]
+                    : spec.kind === "read" ? ("targetUser" in spec ? [args.userId] : [])
+                        : "targetUser" in spec ? [args.userId, args] : [args];
+            return jsonResult(await method(viewer, ...values));
+        }));
+    }
+}
+//# sourceMappingURL=features.js.map

package/mcp/dist/src/tools/features.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pilotswarm",
-    "version": "0.5.63",
+    "version": "0.5.64",
     "description": "PilotSwarm application package: terminal UI, browser portal + Web API server, and MCP server — one install, three bins.",
     "type": "module",
     "license": "MIT",
@@ -81,7 +81,7 @@
         "ink": "^6.8.0",
         "jose": "^6.2.2",
         "mermaid": "^11.16.0",
-        "pilotswarm-sdk": "0.5.63",
+        "pilotswarm-sdk": "0.5.64",
         "react": "^19.2.4",
         "react-dom": "^19.2.4",
         "ws": "^8.18.2"

package/tui/src/node-sdk-transport.js

@@ -1553,6 +1553,19 @@ export class NodeSdkTransport {
         return this.mgmt.listProviders(await this._modelProviderViewer());
     }
 
+    async listFeatureFlags() { return this.mgmt.listFeatureFlags(await this._modelProviderViewer()); }
+    async getClusterFeatureFlags() { return this.mgmt.getClusterFeatureFlags(await this._modelProviderViewer()); }
+    async getMyFeatureFlags() { return this.mgmt.getMyFeatureFlags(await this._modelProviderViewer()); }
+    async getUserFeatureFlags(userId) { return this.mgmt.getUserFeatureFlags(await this._modelProviderViewer(), userId); }
+    async setClusterFeatureFlag(input) { return this.mgmt.setClusterFeatureFlag(await this._modelProviderViewer(), input); }
+    async resetClusterFeatureFlag(input) { return this.mgmt.resetClusterFeatureFlag(await this._modelProviderViewer(), input); }
+    async setMyFeatureFlag(input) { return this.mgmt.setMyFeatureFlag(await this._modelProviderViewer(), input); }
+    async unsetMyFeatureFlag(input) { return this.mgmt.unsetMyFeatureFlag(await this._modelProviderViewer(), input); }
+    async setUserFeatureFlag(userId, input) { return this.mgmt.setUserFeatureFlag(await this._modelProviderViewer(), userId, input); }
+    async unsetUserFeatureFlag(userId, input) { return this.mgmt.unsetUserFeatureFlag(await this._modelProviderViewer(), userId, input); }
+    async listFeatureFlagChanges(limit) { return this.mgmt.listFeatureFlagChanges(await this._modelProviderViewer(), limit); }
+    async listFeatureFlagUsers(query) { return this.mgmt.listFeatureFlagUsers(await this._modelProviderViewer(), query); }
+
     async getModelDefaults() {
         return this.mgmt.getModelDefaults(await this._modelProviderViewer());
     }

package/ui/core/src/controller.js

@@ -1,3 +1,4 @@
+import { applyNativeTaskSnapshot } from "./native-tasks.js";
 import { UI_COMMANDS, FOCUS_REGIONS, INSPECTOR_TABS, cycleValue } from "./commands.js";
 import { BUDGET_SERIES_DAYS, BUDGET_SERIES_RANGES, canvasKey as canvasPrefKey } from "./state.js";
 import { parseAgentSourceLink } from "./repo-links.js";
@@ -55,6 +56,23 @@ import {
 import { findArtifactEntry } from "./state.js";
 import { getTheme, listThemes } from "./themes/index.js";
 
+function preserveNativeTaskProgress(history, current, sessionId) {
+    const retained = current?.nativeTaskSnapshot;
+    if (!retained?.ownerId) return history;
+    // Replay has reconstructed task rows from durable events. Reapply the
+    // latest live projection even when a paging rebuild carried its old
+    // metadata through; individual task revision/terminal guards still let
+    // newer durable truth win and prevent another owner from taking a row.
+    return applyNativeTaskSnapshot({ ...history, nativeTaskSnapshot: undefined }, {
+        version: 1,
+        ...retained,
+        tasks: (current.chat || [])
+            .filter(item => item.kind === "native-task-group")
+            .flatMap(group => group.tasks)
+            .filter(task => task.ownerId === retained.ownerId),
+    }, { sessionId, seq: retained.liveSeq });
+}
+
 /**
  * The copy selector for a package LIST row: which same-named copy it is.
  * Scope shadowing means one name can be a shared package AND a user copy at
@@ -2523,6 +2541,8 @@ export class PilotSwarmUiController {
     }
 
     async stop() {
+        this._featureRefreshSerial = (this._featureRefreshSerial || 0) + 1;
+        this._featureUserSerial = (this._featureUserSerial || 0) + 1;
         for (const timer of this._liveTurnIdleTimers?.values() || []) clearTimeout(timer);
         this._liveTurnIdleTimers?.clear();
         if (this.catalogTimer) clearInterval(this.catalogTimer);
@@ -2593,6 +2613,7 @@ export class PilotSwarmUiController {
         // navigation-intent branch returns before the tail): the worker
         // registry must refresh on every tick of the loop that provably runs.
         this.refreshWorkerRegistryIfStale().catch(() => {});
+        this.refreshFeatureFlagsIfStale().catch(() => {});
         // Refreshes OVERLAP. The catalog loop ticks every 4s and a dozen
         // actions call this directly, while one run awaits several sequential
         // round-trips (N catalog pages, the folder list, up to two getSession
@@ -3003,6 +3024,7 @@ export class PilotSwarmUiController {
                     }
                 }
             }
+            history = preserveNativeTaskProgress(history, current, sessionId);
             this.dispatch({
                 type: "history/set",
                 sessionId,
@@ -3237,6 +3259,7 @@ export class PilotSwarmUiController {
         if (this.getState().ui?.budgetOpen) this.closeBudget();
         this.dispatch({ type: "admin/visibility", visible: true });
         await this.refreshAdminProfile().catch(() => {});
+        if (this.getState().admin?.section === "features") void this.refreshFeatureFlags();
         void this.refreshAdminModelProviders().catch(() => {});
         void this.refreshAdminAgentPackages().catch(() => {});
     }
@@ -3707,6 +3730,7 @@ export class PilotSwarmUiController {
 
     setAdminSection(section) {
         this.dispatch({ type: "admin/section", section });
+        if (section === "features") void this.refreshFeatureFlags();
         if (section === "providers") {
             const providers = this.getState().admin?.modelProviders;
             if (!providers?.fetchedAt) void this.refreshAdminModelProviders().catch(() => {});
@@ -3722,6 +3746,251 @@ export class PilotSwarmUiController {
         }
     }
 
+    async selectFeatureScope(mode, userId = null) {
+        if (!["mine", "cluster", "users"].includes(mode)) return;
+        if (this.getState().admin?.features?.saving || mode !== "mine" && !this._featureIsAdmin()) return;
+        if (mode === "users" && userId !== null && (!Number.isSafeInteger(userId) || userId <= 0)) return;
+        this.dispatch({ type: "admin/features", patch: { mode, userId: mode === "users" ? userId : null,
+            data: null, error: null, notice: null, fetchedAt: null, dirtyDrafts: {} } });
+        await this.refreshFeatureFlags();
+    }
+
+    _featureIsAdmin() {
+        const state = this.getState();
+        const role = state.auth?.authorization?.role;
+        return state.admin?.profile?.isAdmin === true && (!role || role === "admin" || role === "anonymous");
+    }
+
+    _featureContext() {
+        const state = this.getState();
+        const features = state.admin.features;
+        return JSON.stringify([features.generation, features.mode, features.userId,
+            state.auth?.principal?.provider, state.auth?.principal?.subject, state.auth?.authorization?.role,
+            state.admin.profile?.provider, state.admin.profile?.subject, state.admin.profile?.isAdmin]);
+    }
+
+    async _featureRequest(read) {
+        let timeout;
+        try {
+            return await Promise.race([Promise.resolve().then(read), new Promise((_, reject) => {
+                timeout = setTimeout(() => reject(new Error("Feature request timed out. Retry or refresh the settings.")), 10_000);
+                timeout?.unref?.();
+            })]);
+        } finally { clearTimeout(timeout); }
+    }
+
+    async refreshFeatureFlagsIfStale() {
+        const admin = this.getState().admin;
+        const features = admin?.features;
+        if (!admin?.visible || admin.section !== "features" || features?.loading || features?.saving
+            || Object.keys(features?.dirtyDrafts || {}).length
+            || features?.fetchedAt && Date.now() - features.fetchedAt < 20_000) return;
+        await this.refreshFeatureFlags({ background: true });
+    }
+
+    setFeatureDraftDirty(featureKey, dirty) {
+        const dirtyDrafts = { ...this.getState().admin.features.dirtyDrafts };
+        if (dirty) dirtyDrafts[featureKey] = true;
+        else delete dirtyDrafts[featureKey];
+        this.dispatch({ type: "admin/features", patch: { dirtyDrafts } });
+    }
+
+    _featureDraftKey(featureKey) {
+        const features = this.getState().admin.features;
+        return JSON.stringify([features.mode, features.mode === "users" ? features.userId : null, featureKey]);
+    }
+
+    getFeatureDraft(featureKey) {
+        return this.getState().admin.features.drafts?.[this._featureDraftKey(featureKey)];
+    }
+
+    getFeatureDraftCount(mode) {
+        return Object.values(this.getState().admin.features.drafts || {}).filter(draft => draft.mode === mode).length;
+    }
+
+    setFeatureDraft(featureKey, values) {
+        const features = this.getState().admin.features;
+        if (features.saving || features.mode !== "mine" && !this._featureIsAdmin()
+            || features.mode === "users" && !features.userId) return;
+        const flag = features.data?.flags?.find(item => item.featureKey === featureKey);
+        if (!flag?.supported) return;
+        const key = this._featureDraftKey(featureKey);
+        const existing = features.drafts?.[key];
+        const stored = features.mode === "cluster" ? flag.cluster : flag.user;
+        // Null is an operation (remove the override), not merely a pair of
+        // values equal to today's defaults. Keep reset intent when a row exists.
+        const equal = values === null ? !stored : features.mode === "cluster"
+            ? values.enabled === (flag.cluster?.enabled ?? flag.defaultEnabled)
+                && values.allowUserOverride === (flag.cluster?.allowUserOverride ?? flag.defaultAllowUserOverride)
+            : Boolean(stored) && values.enabled === stored.enabled;
+        const drafts = { ...features.drafts };
+        if (equal && !existing?.uncertain && !existing?.needsReview) delete drafts[key];
+        else drafts[key] = { featureKey, mode: features.mode, userId: features.userId,
+            values: values === null ? null : { ...values }, expectedRevision: existing?.expectedRevision ?? flag.revision,
+            ...(existing?.uncertain ? { uncertain: true } : {}), ...(existing?.needsReview ? { needsReview: true } : {}) };
+        this.dispatch({ type: "admin/features", patch: { drafts, error: null, notice: null } });
+    }
+
+    async discardFeatureDraft(featureKey) {
+        if (this.getState().admin.features.saving) return;
+        const draft = this.getFeatureDraft(featureKey);
+        const context = this._featureContext();
+        // A lost response may hide a committed save. Reconcile it before
+        // discarding so the old cached value cannot look authoritative.
+        if (draft?.uncertain && !await this.refreshFeatureFlags()) return;
+        if (context !== this._featureContext() || this.getFeatureDraft(featureKey) !== draft) return;
+        if (draft?.uncertain) {
+            const revision = this.getState().admin.features.data?.flags?.find(flag => flag.featureKey === featureKey)?.revision;
+            // A GET at the old revision cannot rule out the timed-out write
+            // committing later. A newer revision fences its compare-and-set.
+            if (!revision || BigInt(revision) <= BigInt(draft.expectedRevision)) {
+                this.dispatch({ type: "admin/features", patch: { error: "The earlier save is still unconfirmed. Retry Save or refresh before discarding changes." } });
+                return;
+            }
+        }
+        const drafts = { ...this.getState().admin.features.drafts };
+        delete drafts[this._featureDraftKey(featureKey)];
+        this.dispatch({ type: "admin/features", patch: { drafts, error: null, notice: null } });
+    }
+
+    reviewFeatureDraft(featureKey) {
+        const features = this.getState().admin.features;
+        if (features.saving || features.loading || features.mode !== "mine" && !this._featureIsAdmin()) return;
+        const key = this._featureDraftKey(featureKey);
+        const draft = features.drafts?.[key];
+        const flag = features.data?.flags?.find(item => item.featureKey === featureKey);
+        if (!draft || !flag?.supported || draft.needsReview && draft.expectedRevision === flag.revision) return;
+        this.dispatch({ type: "admin/features", patch: { drafts: { ...features.drafts,
+            [key]: { ...draft, expectedRevision: flag.revision, needsReview: false, uncertain: false } }, error: null, notice: "Latest saved setting reviewed. Your changes are still unsaved." } });
+    }
+
+    async saveFeatureDraft(featureKey) {
+        const draft = this.getFeatureDraft(featureKey);
+        if (!draft) return;
+        const flag = this.getState().admin.features.data?.flags?.find(item => item.featureKey === featureKey);
+        if (draft.needsReview || draft.expectedRevision !== flag?.revision) {
+            this.dispatch({ type: "admin/features", patch: { error: "Settings changed elsewhere. Review the latest saved setting before saving your changes." } });
+            return;
+        }
+        await this.saveFeatureFlag(featureKey, draft.values, { draft });
+    }
+
+    async searchFeatureUsers(query = "") {
+        if (!this._featureIsAdmin()) return;
+        const serial = this._featureUserSerial = (this._featureUserSerial || 0) + 1;
+        const context = this._featureContext();
+        this.dispatch({ type: "admin/features", patch: { userQuery: String(query), usersLoading: true, metadataError: null } });
+        const current = () => this._featureUserSerial === serial && this._featureContext() === context;
+        try {
+            const users = await this._featureRequest(() => this.transport.listFeatureFlagUsers(String(query)));
+            if (current()) {
+                const features = this.getState().admin.features;
+                const selected = features.users?.find(user => user.userId === features.userId);
+                const selectedUserOutsideResults = Boolean(selected && !users.some(user => user.userId === selected.userId));
+                // Searching must not remove the identity/option of the user
+                // whose saved policy and draft remain active below the picker.
+                this.dispatch({ type: "admin/features", patch: {
+                    users: selectedUserOutsideResults ? [selected, ...users] : users,
+                    selectedUserOutsideResults, usersLoading: false,
+                } });
+            }
+        } catch (error) {
+            if (current()) this.dispatch({ type: "admin/features", patch: { usersLoading: false,
+                metadataError: `User directory: ${error?.message || error}` } });
+        }
+    }
+
+    async refreshFeatureFlags({ background = false } = {}) {
+        const serial = (this._featureRefreshSerial ?? 0) + 1;
+        this._featureRefreshSerial = serial;
+        const features = this.getState().admin?.features || { mode: "mine" };
+        if (features.mode !== "mine" && !this._featureIsAdmin()) return;
+        const context = this._featureContext();
+        const current = () => this._featureRefreshSerial === serial && this._featureContext() === context;
+        this.dispatch({ type: "admin/features", patch: { loading: true, ...(background ? {} : { error: null }) } });
+        // Directory/adoption are independent diagnostics: neither may block policy.
+        if (!background && this._featureIsAdmin()) {
+            void this.searchFeatureUsers(features.userQuery || "");
+            void this.refreshWorkerRegistryIfStale();
+        }
+        try {
+            const data = await this._featureRequest(() => features.mode === "cluster" ? this.transport.getClusterFeatureFlags()
+                : features.mode === "users" ? features.userId ? this.transport.getUserFeatureFlags(features.userId) : null
+                    : this.transport.getMyFeatureFlags());
+            if (!current()) return false;
+            this.dispatch({ type: "admin/features", patch: { data, loading: false, fetchedAt: Date.now() } });
+            return true;
+        } catch (error) {
+            if (current()) this.dispatch({ type: "admin/features", patch: { loading: false, fetchedAt: Date.now(), error: String(error?.message || error) } });
+            return false;
+        }
+    }
+
+    async saveFeatureFlag(featureKey, values, { draft } = {}) {
+        const features = this.getState().admin?.features;
+        if (!features || features.saving || features.loading || features.mode !== "mine" && !this._featureIsAdmin()) return;
+        const definition = features.data?.flags?.find(flag => flag.featureKey === featureKey);
+        if (!definition?.supported || features.mode === "users" && !features.userId) return;
+        const target = this._featureContext();
+        const draftKey = this._featureDraftKey(featureKey);
+        const expectedRevision = draft?.expectedRevision ?? definition.revision;
+        const signature = JSON.stringify([target, featureKey, expectedRevision, values]);
+        this._featureMutationRetries ??= new Map();
+        const requestId = this._featureMutationRetries.get(signature) ?? globalThis.crypto.randomUUID();
+        this._featureMutationRetries.set(signature, requestId);
+        const input = { featureKey, expectedRevision, requestId, ...(values || {}) };
+        this.dispatch({ type: "admin/features", patch: { saving: true, error: null, notice: null } });
+        try {
+            const outcome = await this._featureRequest(() => {
+                if (features.mode === "cluster") return this.transport[values ? "setClusterFeatureFlag" : "resetClusterFeatureFlag"](input);
+                if (features.mode === "users") return this.transport[values ? "setUserFeatureFlag" : "unsetUserFeatureFlag"](features.userId, input);
+                return this.transport[values ? "setMyFeatureFlag" : "unsetMyFeatureFlag"](input);
+            });
+            this._featureMutationRetries.delete(signature);
+            if (this._featureContext() === target) {
+                // The acknowledged mutation is authoritative even if the
+                // following GET fails. Do not show the old value as saved.
+                if (/^[1-9]\d*$/.test(String(outcome?.revision)) && Object.hasOwn(outcome, "setting")) {
+                    const updated = { ...definition, revision: outcome.revision,
+                        [features.mode === "cluster" ? "cluster" : "user"]: outcome.setting };
+                    const allowUser = updated.cluster?.allowUserOverride ?? updated.defaultAllowUserOverride;
+                    updated.effective = allowUser && updated.user ? updated.user.enabled
+                        : updated.cluster?.enabled ?? updated.defaultEnabled;
+                    updated.source = allowUser && updated.user ? "user" : updated.cluster ? "cluster" : "default";
+                    updated.userOverrideIgnored = Boolean(updated.user && !allowUser);
+                    const data = this.getState().admin.features.data;
+                    this.dispatch({ type: "admin/features", patch: { data: { ...data,
+                        flags: data.flags.map(flag => flag.featureKey === featureKey ? updated : flag) } } });
+                }
+                if (draft && this.getState().admin.features.drafts?.[draftKey] === draft) {
+                    const drafts = { ...this.getState().admin.features.drafts };
+                    delete drafts[draftKey];
+                    this.dispatch({ type: "admin/features", patch: { drafts } });
+                }
+                await this.refreshFeatureFlags();
+                if (this._featureContext() === target) this.dispatch({ type: "admin/features", patch: { notice: "Setting saved." } });
+            }
+        } catch (error) {
+            if (this._featureContext() === target) {
+                if (draft && (error?.status === 409 || error?.code === "FEATURE_CONFLICT")) {
+                    this._featureMutationRetries.delete(signature);
+                    this.dispatch({ type: "admin/features", patch: { drafts: { ...this.getState().admin.features.drafts,
+                        [draftKey]: { ...draft, needsReview: true } } } });
+                    const refreshed = await this.refreshFeatureFlags({ background: true });
+                    if (this._featureContext() === target) this.dispatch({ type: "admin/features", patch: {
+                        error: refreshed ? "Settings changed elsewhere. Review the latest saved setting before saving your changes."
+                            : "Settings changed elsewhere, but the latest setting could not be loaded. Refresh settings before reviewing and saving your changes." } });
+                    return;
+                }
+                if (draft && !(error?.status >= 400 && error?.status < 500)) {
+                    this.dispatch({ type: "admin/features", patch: { drafts: { ...this.getState().admin.features.drafts,
+                        [draftKey]: { ...draft, uncertain: true } } } });
+                }
+                this.dispatch({ type: "admin/features", patch: { error: String(error?.message || error) } });
+            }
+        } finally { if (this._featureContext() === target) this.dispatch({ type: "admin/features", patch: { saving: false } }); }
+    }
+
     /** Node Map: select a node (toggles off when re-selected). Scopes Activity. */
     selectNodeMapNode(label) {
         this.dispatch({ type: "ui/nodeMapSelect", label: label ? String(label) : null });
@@ -5784,6 +6053,12 @@ export class PilotSwarmUiController {
         // history would corrupt the replay cursor — and they must never
         // appear in the transcript.
         if (event.transient === true) {
+            if (event.eventType === "session.native_tasks_tick") {
+                const existing = this.getState().history.bySessionId.get(sessionId);
+                const history = applyNativeTaskSnapshot(existing, event.data, { sessionId, seq: event.liveSeq });
+                if (history && history !== existing) this.dispatch({ type: "history/set", sessionId, history });
+                return true;
+            }
             if (event.eventType === "assistant.live_tick") {
                 // A worker can die leaving a reasoning-only retained row.
                 // On re-entry its message ID cannot match a durable final;
@@ -9811,6 +10086,7 @@ export class PilotSwarmUiController {
                     lastSeq: events[events.length - 1]?.seq || 0,
                 };
             }
+            history = preserveNativeTaskProgress(history, this.getState().history.bySessionId.get(sessionId), sessionId);
             this.dispatch({
                 type: "history/set",
                 sessionId,

package/ui/core/src/history.js

@@ -2,6 +2,8 @@ import { formatHumanDurationSeconds, formatTimestamp, shortModelName, shortSessi
 import { isCanvasActionContent, parseCanvasActionContent } from "./canvas-actions.js";
 import { formatCompactionActivityRuns } from "./context-usage.js";
 import { canonicalSystemTitle } from "./system-titles.js";
+import { matchesSessionError } from "./session-warning.js";
+import { appendNativeTaskEvent } from "./native-tasks.js";
 import { buildSessionWarning } from "./session-errors.js";
 import { appendChatCall, CHAT_CALL_EVENT_TYPES } from "./chat-activity.js";
 
@@ -19,13 +21,20 @@ export const HISTORY_EVENT_LIMIT_STEPS = [
 // load transcript pages instead of raw-stream pages.
 export const CHAT_HISTORY_EVENT_TYPES = [
     ...CHAT_CALL_EVENT_TYPES,
-    "session.error",
     "user.message",
     "assistant.message",
     // Needed to distinguish interim assistant output from the final answer
     // when an older transcript page is loaded.
     "session.turn_completed",
     "session.turn_stopped",
+    // Warnings belong at the error's position in the transcript, including
+    // after recovery and when paging backward through a noisy session.
+    "session.error",
+    "subagent.started",
+    "subagent.configured",
+    "subagent.completed",
+    "subagent.failed",
+    "native.task_updated",
     "system.message",
     // Session regeneration boundary — rendered as an inline epoch divider in
     // the transcript, so it must survive backward chat-history paging.
@@ -90,6 +99,63 @@ function buildRegenFailedItem(event) {
     };
 }
 
+function buildSessionWarningItem(event) {
+    const completed = event.eventType === "session.turn_completed" && event.data?.resultType === "error";
+    if (event.eventType !== "session.error" && !completed) return null;
+    const warning = buildSessionWarning(event);
+    if (!warning) return null;
+    return {
+        ...warning,
+        errorText: warning.text,
+        sourceEventType: event.eventType,
+        ...(completed ? { turnCompletedSeq: event.seq } : {}),
+        time: formatTimestamp(event.createdAt),
+    };
+}
+
+function appendSessionWarning(chat, event) {
+    const warning = buildSessionWarningItem(event);
+    if (!warning) return;
+    if (chat.some((item) => item.id === warning.id
+        || (item.turnCompletedSeq != null && item.turnCompletedSeq === event.seq))) return;
+    // Tool disclosures can arrive between the SDK error and the failed-turn
+    // summary. They do not start a different conversation/failure episode.
+    const previousIndex = chat.findLastIndex(item => item.kind !== "chat-call" && item.kind !== "native-task-group");
+    const previous = chat[previousIndex];
+    // A runtime error and its failed-turn summary can describe one failure.
+    // Retain the original anchor; subsequent failed turns remain distinct.
+    if (previous?.kind === "session-warning"
+        && previous.sourceEventType === "session.error"
+        && previous.turnCompletedSeq == null
+        && event.eventType === "session.turn_completed"
+        && matchesSessionError(previous.errorText, warning.errorText)) {
+        chat[previousIndex] = { ...previous, turnCompletedSeq: event.seq };
+        return;
+    }
+    chat.push(warning);
+}
+
+const parentChatCallTypes = new Set(CHAT_CALL_EVENT_TYPES);
+function appendParentChatCall(chat, event) {
+    if (!parentChatCallTypes.has(event?.eventType)) return;
+    const data = event?.data || {};
+    // Native tasks have their own abridged disclosure. Generic call cards
+    // would duplicate them and reveal the full native prompt/arguments.
+    const name = data.toolName || data.name;
+    const namespace = `${event.sessionId}:${data.durableSessionId || ""}`;
+    const keys = [data.toolCallId && `call:${data.toolCallId}`, data.requestId && `request:${data.requestId}`].filter(Boolean);
+    // An empty diagnostic completion has neither a call to update nor useful
+    // content. Keep it in Activity without evicting real conversation cards.
+    const hasContent = name || data.arguments != null || data.args != null || data.result != null || data.output != null
+        || data.error || data.partialOutput || data.progressMessage || data.childSessionId || data.agentId || data.task;
+    if (!keys.length && !hasContent) return;
+    const parentCall = !name && chat.some(item => item.kind === "chat-call" && item.namespace === namespace
+        && item.callKeys.some(key => keys.includes(key)));
+    const nativeCall = name === "task" || Boolean(!name && !parentCall && data.toolCallId && chat.some(item =>
+        item.kind === "native-task-group" && item.tasks.some(task => task.toolCallId === data.toolCallId)));
+    if (!nativeCall) appendChatCall(chat, event);
+}
+
 function clampHistoryItems(items, maxItems) {
     const list = Array.isArray(items) ? items.filter(Boolean) : [];
     const safeMax = Math.max(DEFAULT_HISTORY_EVENT_LIMIT, Number(maxItems) || DEFAULT_HISTORY_EVENT_LIMIT);
@@ -881,7 +947,21 @@ function formatActivity(event) {
     const body = formatEventSnippet(event);
     let runs = null;
 
+    // Native child transcripts remain inspectable as events, but only their
+    // lifecycle belongs in the parent's activity feed.
+    if (event.eventType?.startsWith("native.") || event.eventType === "session.background_tasks_changed") return null;
     switch (event.eventType) {
+        case "subagent.started":
+        case "subagent.completed":
+        case "subagent.failed": {
+            const phase = event.eventType.slice("subagent.".length);
+            const name = event.data?.agentDisplayName || event.data?.agentName || "agent";
+            const duration = Number.isFinite(event.data?.durationMs)
+                ? ` (${formatHumanDurationSeconds(event.data.durationMs / 1000)})` : "";
+            runs = buildLabeledActivityRuns(time, "[native agent]", "cyan", `${name} ${phase}${duration}`, phase === "failed" ? "red" : "white");
+            break;
+        }
+        case "subagent.configured":
         case "assistant.usage":
         case "session.info":
         case "session.idle":
@@ -1226,11 +1306,9 @@ export function buildHistoryModel(events = [], options = {}) {
 
     for (const event of events) {
         storedEvents.push(event);
-        appendChatCall(chat, event);
-        if (event.eventType === "session.error") {
-            const warning = buildSessionWarning(event);
-            if (warning) chat.push(warning);
-        }
+        appendNativeTaskEvent(chat, event);
+        appendParentChatCall(chat, event);
+        appendSessionWarning(chat, event);
         if (["user.message", "session.turn_completed", "session.turn_stopped", "session.epoch_committed"].includes(event.eventType)) {
             settleAssistantResponses(chat, event);
         }
@@ -1309,6 +1387,7 @@ export function appendEventToHistory(history, event) {
         ? existingEvents
         : [...existingEvents, event].slice(-loadedEventLimit);
     const next = {
+        nativeTaskSnapshot: history?.nativeTaskSnapshot,
         closedLiveKeys: history?.closedLiveKeys || [],
         closedLiveStreams: history?.closedLiveStreams || [],
         chat: clampHistoryItems(history?.chat || [], loadedEventLimit),
@@ -1328,14 +1407,10 @@ export function appendEventToHistory(history, event) {
         stoppedMessageIds: Array.isArray(history?.stoppedMessageIds) ? history.stoppedMessageIds : [],
     };
 
-    if (event.eventType === "session.error") {
-        const warning = buildSessionWarning(event);
-        if (warning && !next.chat.some(item => item.id === warning.id)) {
-            next.chat = clampHistoryItems([...next.chat, warning], loadedEventLimit);
-        }
-    }
-
-    appendChatCall(next.chat, event);
+    appendNativeTaskEvent(next.chat, event);
+    appendParentChatCall(next.chat, event);
+    appendSessionWarning(next.chat, event);
+    next.chat = clampHistoryItems(next.chat, loadedEventLimit);
 
     if (["user.message", "session.turn_completed", "session.turn_stopped", "session.epoch_committed"].includes(event.eventType)) {
         settleAssistantResponses(next.chat, event);