@useorgx/openclaw-plugin 0.7.11 → 0.7.16

package/dist/http/index.js

@@ -46,10 +46,11 @@ import { summarizeActivityHeadline } from "./helpers/activity-headline.js";
 import { createAutoContinueEngine, } from "./helpers/auto-continue-engine.js";
 import { createAutopilotOperations, } from "./helpers/autopilot-operations.js";
 import { mapDecisionEntity } from "./helpers/decision-mapper.js";
-import { idempotencyKey, stableHash } from "./helpers/hash-utils.js";
+import { deterministicActivityId, idempotencyKey, stableHash } from "./helpers/hash-utils.js";
 import { createCodexBinResolver, } from "./helpers/autopilot-slice-utils.js";
 import { createLocalArtifactDetailFallbackBuilder } from "./helpers/artifact-fallback.js";
 import { buildMissionControlGraph, deriveExecutionPolicy, dedupeStrings, isDispatchableWorkstreamStatus, isDoneStatus, isInProgressStatus, isTodoStatus, listEntitiesSafe, normalizeEntityMutationPayload, pickStringArray, resolveAutoAssignments, selectSliceTasksByScope, } from "./helpers/mission-control.js";
+import { QueueState, LaneState, RunStatus, RunnerSource, } from "./helpers/queue-constants.js";
 import { configureOpenClawProviderRouting, fetchBillingStatusSafe, isPidAlive, listOpenClawAgents, listOpenClawProviderModels, modelImpliesByok, normalizeOpenClawProvider, resolveAutoOpenClawProvider, resolveByokEnvOverrides, spawnOpenClawAgentTurn, stopDetachedProcess, } from "./helpers/openclaw-cli.js";
 import { fetchKickoffContextSafe, renderKickoffMessage } from "./helpers/kickoff-context.js";
 import { createDispatchLifecycle } from "./helpers/dispatch-lifecycle.js";
@@ -177,6 +178,9 @@ function safeErrorMessage(err) {
         if (normalized.includes("failed to fetch") || normalized.includes("network")) {
             return "network request failed";
         }
+        if (normalized.includes("relation does not exist")) {
+            return sanitized;
+        }
         if (normalized.includes("internal_error") || normalized.includes("internal server error")) {
             return "temporary server issue";
         }
@@ -380,6 +384,16 @@ function deriveStructuredActivityBucket(input) {
         "nonBlockingDecisionCount",
     ]) ?? 0;
     if (event === "autopilot_slice_result") {
+        const parsedStatus = typeof metadata?.parsed_status === "string"
+            ? metadata.parsed_status.trim().toLowerCase()
+            : typeof metadata?.parsedStatus === "string"
+                ? metadata.parsedStatus.trim().toLowerCase()
+                : "";
+        if (parsedStatus === "completed" && decisionRequired === false) {
+            if (artifacts > 0)
+                return "artifact";
+            return "message";
+        }
         // Any blocked slice result needs decision-first surfacing in the Activity UX.
         if (input.phase === "blocked")
             return "decision";
@@ -712,26 +726,10 @@ function activityMetadataStr(metadata, keys) {
     }
     return null;
 }
-const SEMANTIC_ACTIVITY_EVENTS = new Set([
-    "autopilot_slice_result",
-    "auto_continue_started",
-    "auto_continue_stopped",
-    "next_up_manual_dispatch_started",
-    "autopilot_slice_mcp_handshake_failed",
-    "autopilot_slice_timeout",
-    "autopilot_slice_log_stall",
-    "auto_continue_spawn_guard_blocked",
-    "auto_continue_spawn_guard_rate_limited",
-    "autopilot_autofix_scheduled",
-    "autopilot_autofix_executed",
-    "autopilot_autofix_skipped",
-]);
 function semanticActivityKey(item) {
     const metadata = asActivityMetadataRecord(item.metadata);
     const eventRaw = metadata?.event;
     const event = typeof eventRaw === "string" ? eventRaw.trim().toLowerCase() : "";
-    if (!event || !SEMANTIC_ACTIVITY_EVENTS.has(event))
-        return null;
     const runLike = (typeof item.runId === "string" && item.runId.trim().length > 0
         ? item.runId.trim()
         : null) ??
@@ -755,6 +753,8 @@ function semanticActivityKey(item) {
     const stopReason = activityMetadataStr(metadata, ["stop_reason", "stopReason"]);
     const parsedStatus = activityMetadataStr(metadata, ["parsed_status", "parsedStatus"]);
     const title = (item.title ?? "").trim().toLowerCase();
+    if (!event && !runLike && !correlationId)
+        return null;
     if (!runLike && !correlationId && !workstreamId && !taskId)
         return null;
     return [
@@ -769,6 +769,27 @@ function semanticActivityKey(item) {
         title,
     ].join("|");
 }
+function activityRichness(item) {
+    let score = 0;
+    const meta = item.metadata;
+    if (meta)
+        score += Object.keys(meta).length;
+    if (item.summary)
+        score += 2;
+    if (item.description)
+        score += 2;
+    if (item.agentName)
+        score += 1;
+    if (item.runtimeLabel)
+        score += 1;
+    if (item.runtimeProvider)
+        score += 1;
+    if (item.phase)
+        score += 1;
+    if (item.state)
+        score += 1;
+    return score;
+}
 function mergeActivities(base, extra, limit) {
     const merged = [...(base ?? []), ...(extra ?? [])].sort((a, b) => {
         const timestampDelta = Date.parse(b.timestamp) - Date.parse(a.timestamp);
@@ -779,15 +800,28 @@ function mergeActivities(base, extra, limit) {
     const deduped = [];
     const seenIds = new Set();
     const seenSemantic = new Set();
+    const semanticIdx = new Map();
     for (const item of merged) {
-        if (seenIds.has(item.id))
+        if (seenIds.has(item.id)) {
+            const existingIdx = deduped.findIndex(d => d.id === item.id);
+            if (existingIdx >= 0 && activityRichness(item) > activityRichness(deduped[existingIdx])) {
+                deduped[existingIdx] = item;
+            }
             continue;
+        }
         seenIds.add(item.id);
         const sk = semanticActivityKey(item);
-        if (sk && seenSemantic.has(sk))
+        if (sk && seenSemantic.has(sk)) {
+            const existingIdx = semanticIdx.get(sk);
+            if (activityRichness(item) > activityRichness(deduped[existingIdx])) {
+                deduped[existingIdx] = item;
+            }
             continue;
-        if (sk)
+        }
+        if (sk) {
             seenSemantic.add(sk);
+            semanticIdx.set(sk, deduped.length);
+        }
         deduped.push(item);
         if (deduped.length >= limit)
             break;
@@ -1812,7 +1846,7 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
     };
     const codexBinResolver = createCodexBinResolver();
     const resolveCodexBinInfo = () => codexBinResolver.resolveCodexBinInfo();
-    const { autoContinueRuns, autoContinueSliceRuns, localInitiativeStatusOverrides, writeRuntimeEvent, autoContinueTickMs: AUTO_CONTINUE_TICK_MS, defaultAutoContinueTokenBudget, defaultAutoContinueMaxParallelSlices, setLocalInitiativeStatusOverride, clearLocalInitiativeStatusOverride, applyLocalInitiativeOverrides, applyLocalInitiativeOverrideToGraph, updateInitiativeAutoContinueState, stopAutoContinueRun, tickAutoContinueRun, tickAllAutoContinue, isInitiativeActiveStatus, runningAutoContinueForWorkstream, getAutoContinueLaneForWorkstream, scheduleAutoFixForWorkstream, startAutoContinueRun, } = createAutoContinueEngine({
+    const { autoContinueRuns, autoContinueSliceRuns, localInitiativeStatusOverrides, writeRuntimeEvent, autoContinueTickMs: AUTO_CONTINUE_TICK_MS, defaultAutoContinueTokenBudget, defaultAutoContinueMaxParallelSlices, setLocalInitiativeStatusOverride, clearLocalInitiativeStatusOverride, applyLocalInitiativeOverrides, applyLocalInitiativeOverrideToGraph, updateInitiativeAutoContinueState, stopAutoContinueRun, tickAutoContinueRun, tickAllAutoContinue, isInitiativeActiveStatus, runningAutoContinueForWorkstream, getAutoContinueLaneForWorkstream, scheduleAutoFixForWorkstream, startAutoContinueRun, skipCurrentWorkstream, getCanonicalAutopilotState, } = createAutoContinueEngine({
         client,
         filename: __filename,
         safeErrorMessage,
@@ -2173,11 +2207,11 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
             initiativeStatusById.set(initiativeId, override.status);
         }
         const queueRank = (state) => {
-            if (state === "running")
+            if (state === QueueState.RUNNING)
                 return 0;
-            if (state === "queued")
+            if (state === QueueState.QUEUED)
                 return 1;
-            if (state === "blocked")
+            if (state === QueueState.BLOCKED)
                 return 2;
             return 3;
         };
@@ -2322,12 +2356,12 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                 const hasRunning = statusValues.some((status) => isInProgressStatus(status));
                 const hasQueued = statusValues.some((status) => status === "queued" || status === "pending");
                 const queueState = hasRunning
-                    ? "running"
+                    ? QueueState.RUNNING
                     : hasBlocked
-                        ? "blocked"
+                        ? QueueState.BLOCKED
                         : hasQueued
-                            ? "queued"
-                            : "idle";
+                            ? QueueState.QUEUED
+                            : QueueState.IDLE;
                 const latestRunner = [];
                 const latestRunnerSeen = new Set();
                 pushRunnerAgent(latestRunner, latestRunnerSeen, {
@@ -2341,7 +2375,7 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                 const runnerAgentId = primaryRunner?.id ?? "unassigned";
                 const runnerAgentName = primaryRunner?.name ?? "Unassigned";
                 const pinKey = `${entry.initiativeId}:${entry.workstreamId}`;
-                if (isSuppressed(entry.initiativeId, entry.workstreamId) && queueState !== "running") {
+                if (isSuppressed(entry.initiativeId, entry.workstreamId) && queueState !== QueueState.RUNNING) {
                     continue;
                 }
                 fallbackItems.push({
@@ -2360,7 +2394,7 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                     runnerAgentId,
                     runnerAgentName,
                     runnerAgents,
-                    runnerSource: "fallback",
+                    runnerSource: RunnerSource.FALLBACK,
                     queueState,
                     blockReason: hasBlocked
                         ? entry.blockers[0] ??
@@ -2545,7 +2579,7 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                     : [];
                 const runScopedToCurrentWorkstream = scopedAllowedWorkstreams.length === 1 &&
                     scopedAllowedWorkstreams[0] === workstream.id &&
-                    autoContinueRun?.status === "running";
+                    autoContinueRun?.status === RunStatus.RUNNING;
                 const activeRunIds = Array.isArray(autoContinueRun?.activeSliceRunIds)
                     ? autoContinueRun.activeSliceRunIds
                         .filter((id) => typeof id === "string" && id.trim().length > 0)
@@ -2595,20 +2629,26 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                 const sliceMilestoneId = defaultScope === "milestone"
                     ? scopeSelection.milestoneIds[0] ?? pin?.preferredMilestoneId ?? null
                     : null;
-                let queueState = laneState === "running"
-                    ? "running"
-                    : runScopedToCurrentWorkstream
-                        ? "running"
-                        : candidateTask
-                            ? "queued"
-                            : "idle";
+                // Only mark as "running" when the lane is actively executing a slice.
+                // runScopedToCurrentWorkstream means the initiative run targets this
+                // workstream, but the lane may be idle between slices — don't conflate
+                // "scoped to a running initiative" with "actively executing".
+                const laneIsActivelyRunning = laneState === LaneState.RUNNING ||
+                    (runScopedToCurrentWorkstream && activeRunIds.length > 0);
+                let queueState = laneIsActivelyRunning
+                    ? QueueState.RUNNING
+                    : candidateTask
+                        ? QueueState.QUEUED
+                        : runScopedToCurrentWorkstream
+                            ? QueueState.QUEUED
+                            : QueueState.IDLE;
                 let blockReason = null;
-                if (laneState === "blocked") {
-                    queueState = "blocked";
+                if (laneState === LaneState.BLOCKED) {
+                    queueState = QueueState.BLOCKED;
                     blockReason = autoContinueLane?.blockedReason ?? "Blocked";
                 }
-                else if (laneState === "waiting_dependency") {
-                    queueState = "blocked";
+                else if (laneState === LaneState.WAITING_DEPENDENCY) {
+                    queueState = QueueState.BLOCKED;
                     if (Array.isArray(autoContinueLane?.waitingOnWorkstreamIds) &&
                         autoContinueLane.waitingOnWorkstreamIds.length > 0) {
                         const waitingTitles = autoContinueLane.waitingOnWorkstreamIds
@@ -2626,12 +2666,12 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                         blockReason = "Waiting on dependency workstreams";
                     }
                 }
-                else if (laneState === "rate_limited") {
-                    queueState = "blocked";
+                else if (laneState === LaneState.RATE_LIMITED) {
+                    queueState = QueueState.BLOCKED;
                     blockReason = autoContinueLane?.blockedReason ?? "Rate-limited";
                 }
                 if (!autoContinueRun && !readyTask && candidateTask) {
-                    queueState = "blocked";
+                    queueState = QueueState.BLOCKED;
                     const blockedDeps = candidateTask.dependencyIds
                         .map((depId) => nodeById.get(depId))
                         .filter((dependency) => Boolean(dependency && !isDoneStatus(dependency.status)))
@@ -2649,7 +2689,7 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                 if (!candidateTask && !autoContinueRun && !pin) {
                     continue;
                 }
-                if (isSuppressed(initiativeId, workstream.id) && queueState !== "running") {
+                if (isSuppressed(initiativeId, workstream.id) && queueState !== QueueState.RUNNING) {
                     continue;
                 }
                 runningWorkstreams.add(workstream.id);
@@ -2684,10 +2724,10 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                 }
                 const runnerAgents = assignedRunnerAgents.length > 0 ? assignedRunnerAgents : inferredRunnerAgents;
                 const runnerSource = assignedRunnerAgents.length > 0
-                    ? "assigned"
+                    ? RunnerSource.ASSIGNED
                     : runnerAgents.length > 0
-                        ? "inferred"
-                        : "fallback";
+                        ? RunnerSource.INFERRED
+                        : RunnerSource.FALLBACK;
                 const primaryRunner = runnerAgents[0] ?? null;
                 const runnerAgentId = primaryRunner?.id ?? "unassigned";
                 const runnerAgentName = primaryRunner?.name ?? "Unassigned";
@@ -2781,14 +2821,14 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                         : activeTaskId
                             ? [activeTaskId]
                             : [];
-                    const queueState = laneState === "running"
-                        ? "running"
-                        : laneState === "blocked" ||
-                            laneState === "waiting_dependency" ||
-                            laneState === "rate_limited"
-                            ? "blocked"
-                            : "queued";
-                    if (isSuppressed(initiativeId, workstream.id) && queueState !== "running") {
+                    const queueState = laneState === LaneState.RUNNING
+                        ? QueueState.RUNNING
+                        : laneState === LaneState.BLOCKED ||
+                            laneState === LaneState.WAITING_DEPENDENCY ||
+                            laneState === LaneState.RATE_LIMITED
+                            ? QueueState.BLOCKED
+                            : QueueState.QUEUED;
+                    if (isSuppressed(initiativeId, workstream.id) && queueState !== QueueState.RUNNING) {
                         continue;
                     }
                     const runRunnerAgents = [];
@@ -2814,9 +2854,9 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                         runnerAgentId: runPrimaryRunner?.id ?? "unassigned",
                         runnerAgentName: runPrimaryRunner?.name ?? "Unassigned",
                         runnerAgents: runRunnerAgents,
-                        runnerSource: runPrimaryRunner ? "inferred" : "fallback",
+                        runnerSource: runPrimaryRunner ? RunnerSource.INFERRED : RunnerSource.FALLBACK,
                         queueState,
-                        blockReason: queueState === "blocked"
+                        blockReason: queueState === QueueState.BLOCKED
                             ? lane?.blockedReason ?? "Blocked"
                             : null,
                         isPinned: Boolean(pinnedByKey.get(`${initiativeId}:${workstream.id}`)),
@@ -3240,10 +3280,11 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
                 broadcastRuntimeSse("runtime.updated", runtimeRecord);
             }
             clearSnapshotResponseCache();
+            const activityId = deterministicActivityId("run_completed", normalizedRunId, nowIso, runtimeRecord?.agentId ?? existingRun?.agentId ?? null, "dashboard_run_mark_completed");
             try {
                 appendActivityItems([
                     {
-                        id: randomUUID(),
+                        id: activityId,
                         type: "run_completed",
                         title: message,
                         description: reason,
@@ -3275,7 +3316,7 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
             try {
                 const outboxSessionId = runtimeRecord?.initiativeId ?? existingRun?.initiativeId ?? normalizedRunId;
                 const outboxActivityItem = {
-                    id: randomUUID(),
+                    id: activityId,
                     type: "run_completed",
                     title: message,
                     description: reason,
@@ -3376,6 +3417,7 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
         dispatchFallbackWorkstreamTurn,
         tickAutoContinueRun,
         stopAutoContinueRun,
+        skipCurrentWorkstream,
         updateInitiativeAutoContinueState,
         tickAllAutoContinue,
         scheduleAutoFixForWorkstream,
@@ -3551,6 +3593,7 @@ export function createHttpHandler(config, client, getSnapshot, onboarding, diagn
         },
         runAction: (runId, action, input) => client.runAction(runId, action, input),
         listChatThreads: ({ commandCenterId, initiativeId, limit, offset }) => listChatThreads({ commandCenterId, initiativeId, limit, offset }),
+        getCanonicalAutopilotState,
         sendJson,
     });
     registerRuntimeHookRoutes(apiRouter, {

package/dist/http/routes/chat.d.ts

@@ -3,7 +3,7 @@ type JsonRecord = Record<string, unknown>;
 type RegisterChatRoutesDeps<TReq, TRes> = {
     parseJsonRequest: (req: TReq) => Promise<JsonRecord>;
     pickString: (input: Record<string, unknown>, keys: string[]) => string | null;
-    parsePositiveInt: (raw: string | null, fallback: number) => number;
+    parsePositiveInt: (raw: string | null, fallback: number, max?: number) => number;
     emitActivitySafe?: (input: {
         initiativeId: string | null;
         sourceClient?: string;

package/dist/http/routes/chat.js

@@ -1,25 +1,5 @@
 import { getChatThread, linkChatThreadScope, listChatThreads, recordChatLaunch, sendChatMessage, updateChatLaunchStatus, } from "../../chat-store.js";
-function asRecord(value) {
-    if (!value || typeof value !== "object" || Array.isArray(value))
-        return null;
-    return value;
-}
-function asStringArray(value) {
-    if (!Array.isArray(value))
-        return [];
-    const out = [];
-    const seen = new Set();
-    for (const entry of value) {
-        if (typeof entry !== "string")
-            continue;
-        const trimmed = entry.trim();
-        if (!trimmed || seen.has(trimmed))
-            continue;
-        seen.add(trimmed);
-        out.push(trimmed);
-    }
-    return out;
-}
+import { asRecord, asStringArray } from "../../lib/type-coercion.js";
 function normalizeStatus(value) {
     const normalized = (value ?? "").trim().toLowerCase();
     if (normalized === "requested" ||
@@ -181,8 +161,8 @@ export function registerChatRoutes(router, deps) {
             const initiativeId = query.get("initiative_id") ?? query.get("initiative");
             const searchQuery = query.get("query") ?? query.get("q");
             const status = query.get("status");
-            const limit = deps.parsePositiveInt(query.get("limit"), 60);
-            const offset = deps.parsePositiveInt(query.get("offset"), 0);
+            const limit = deps.parsePositiveInt(query.get("limit"), 60, 200);
+            const offset = deps.parsePositiveInt(query.get("offset"), 0, 10000);
             sendThreadList(deps, res, {
                 commandCenterId: commandCenterId?.trim() ?? null,
                 initiativeId: initiativeId?.trim() ?? null,

package/dist/http/routes/entities.js

@@ -1,4 +1,5 @@
 import { resolveWorkspaceScope, workspaceScopeFromHeaders, } from "../helpers/workspace-scope.js";
+import { deriveInitiativeLifecycleStatus } from "../helpers/mission-control.js";
 const WORKSTREAM_REASSIGNMENT_FIELDS = [
     "domain",
     "role",
@@ -38,6 +39,59 @@ function toObjectArray(input) {
         return [];
     return input.filter((item) => Boolean(item) && typeof item === "object");
 }
+async function reconcileInitiativeStatusesFromWorkstreams(deps, rows, input) {
+    if (rows.length === 0)
+        return rows;
+    const initiativeIds = new Set(rows
+        .map((row) => deps.pickString(row, ["id"]))
+        .filter((value) => Boolean(value)));
+    if (initiativeIds.size === 0)
+        return rows;
+    const scopedInitiativeId = input.initiativeId?.trim() ?? "";
+    const scopedWorkspaceId = input.workspaceId?.trim() ?? "";
+    if (!scopedInitiativeId && !scopedWorkspaceId) {
+        // Avoid unscoped global workstream scans.
+        return rows;
+    }
+    const filters = { limit: 2000 };
+    if (scopedInitiativeId) {
+        filters.initiative_id = scopedInitiativeId;
+    }
+    if (scopedWorkspaceId) {
+        filters.workspace_id = scopedWorkspaceId;
+        filters.command_center_id = scopedWorkspaceId;
+    }
+    const response = await deps.client.listEntities("workstream", filters);
+    const workstreamRows = toObjectArray(response && typeof response === "object"
+        ? response.data
+        : []);
+    const childStatusesByInitiative = new Map();
+    for (const workstreamRow of workstreamRows) {
+        const initiativeId = deps.pickString(workstreamRow, ["initiative_id", "initiativeId"]);
+        if (!initiativeId || !initiativeIds.has(initiativeId))
+            continue;
+        const status = deps.pickString(workstreamRow, ["status"]) ?? "todo";
+        const statuses = childStatusesByInitiative.get(initiativeId) ?? [];
+        statuses.push(status);
+        childStatusesByInitiative.set(initiativeId, statuses);
+    }
+    return rows.map((row) => {
+        const initiativeId = deps.pickString(row, ["id"]);
+        const status = deps.pickString(row, ["status"]);
+        if (!initiativeId || !status)
+            return row;
+        const childStatuses = childStatusesByInitiative.get(initiativeId) ?? [];
+        if (childStatuses.length === 0)
+            return row;
+        const normalized = deriveInitiativeLifecycleStatus(status, childStatuses);
+        if (normalized === status)
+            return row;
+        return {
+            ...row,
+            status: normalized,
+        };
+    });
+}
 export function registerEntitiesRoutes(router, deps) {
     router.add("POST", "entities", async ({ req, res }) => {
         try {
@@ -305,13 +359,17 @@ export function registerEntitiesRoutes(router, deps) {
                         return rowScope.trim() === workspaceScopeId;
                     })
                     : searchedRows;
+                const reconciledRows = await reconcileInitiativeStatusesFromWorkstreams(deps, rows, {
+                    initiativeId: id,
+                    workspaceId: workspaceScopeId,
+                }).catch(() => rows);
                 deps.sendJson(res, 200, {
                     ...payload,
-                    data: deps.applyLocalInitiativeOverrides(rows),
+                    data: deps.applyLocalInitiativeOverrides(reconciledRows),
                     pagination: payload.pagination && typeof payload.pagination === "object"
                         ? {
                             ...payload.pagination,
-                            total: rows.length,
+                            total: reconciledRows.length,
                         }
                         : payload.pagination,
                 });

package/dist/http/routes/entity-dynamic.js

@@ -1,3 +1,51 @@
+function resolveEntityActionStatus(entityType, entityAction) {
+    const normalizedType = entityType.trim().toLowerCase();
+    const normalizedAction = entityAction.trim().toLowerCase();
+    const defaultStatusMap = {
+        start: "in_progress",
+        complete: "done",
+        block: "blocked",
+        unblock: "in_progress",
+        pause: "paused",
+        resume: "active",
+    };
+    const statusMapByEntityType = {
+        initiative: {
+            start: "active",
+            complete: "completed",
+            block: "blocked",
+            unblock: "active",
+            pause: "paused",
+            resume: "active",
+        },
+        workstream: {
+            start: "active",
+            complete: "completed",
+            block: "blocked",
+            unblock: "active",
+            pause: "paused",
+            resume: "active",
+        },
+        milestone: {
+            start: "in_progress",
+            complete: "completed",
+            block: "at_risk",
+            unblock: "in_progress",
+            pause: "planned",
+            resume: "in_progress",
+        },
+        task: {
+            start: "in_progress",
+            complete: "done",
+            block: "blocked",
+            unblock: "in_progress",
+            pause: "todo",
+            resume: "in_progress",
+        },
+    };
+    const map = statusMapByEntityType[normalizedType] ?? defaultStatusMap;
+    return map[normalizedAction] ?? null;
+}
 export function registerEntityDynamicRoutes(router, deps) {
     router.add("*", "entities/*", async ({ req, res, path }) => {
         const method = (req.method ?? "GET").toUpperCase();
@@ -137,15 +185,7 @@ export function registerEntityDynamicRoutes(router, deps) {
                     }
                     return;
                 }
-                const statusMap = {
-                    start: "in_progress",
-                    complete: "done",
-                    block: "blocked",
-                    unblock: "in_progress",
-                    pause: "paused",
-                    resume: "active",
-                };
-                const newStatus = statusMap[entityAction];
+                const newStatus = resolveEntityActionStatus(entityType, entityAction);
                 if (!newStatus) {
                     deps.sendJson(res, 400, {
                         error: `Unknown entity action: ${entityAction}`,

package/dist/http/routes/live-snapshot.d.ts

@@ -14,7 +14,7 @@ type SnapshotPersistState = {
     lastPersistAt: number;
 };
 type LiveSnapshotRoutesDeps<TReq, TRes> = {
-    parsePositiveInt: (raw: string | null, fallback: number) => number;
+    parsePositiveInt: (raw: string | null, fallback: number, max?: number) => number;
     readSnapshotResponseCache: (key: string) => Record<string, unknown> | null;
     writeSnapshotResponseCache: (key: string, payload: Record<string, unknown>) => void;
     safeErrorMessage: (err: unknown) => string;
@@ -131,6 +131,15 @@ type LiveSnapshotRoutesDeps<TReq, TRes> = {
         total: number;
         updatedAt: string;
     };
+    getCanonicalAutopilotState?: (initiativeId: string) => {
+        state: "idle" | "running" | "blocked" | "stopping";
+        reason: string | null;
+        activeRunId: string | null;
+        activeWorkstreamId: string | null;
+        activeWorkstreamTitle: string | null;
+        queueHeadTitle: string | null;
+        lastTransitionAt: string;
+    } | null;
     sendJson: (res: TRes, status: number, payload: unknown) => void;
 };
 export declare function registerLiveSnapshotRoutes<TReq, TRes>(router: Router<Record<string, never>, TReq, TRes>, deps: LiveSnapshotRoutesDeps<TReq, TRes>): void;

package/dist/http/routes/live-snapshot.js

@@ -231,9 +231,9 @@ export function registerLiveSnapshotRoutes(router, deps) {
     };
     const headerScopeFromRequest = (req) => workspaceScopeFromHeaders(req?.headers);
     function parseSnapshotQuery(query, headerScope) {
-        const sessionsLimit = deps.parsePositiveInt(query.get("sessionsLimit") ?? query.get("sessions_limit"), 320);
-        const activityLimit = deps.parsePositiveInt(query.get("activityLimit") ?? query.get("activity_limit"), 600);
-        const decisionsLimit = deps.parsePositiveInt(query.get("decisionsLimit") ?? query.get("decisions_limit"), 120);
+        const sessionsLimit = deps.parsePositiveInt(query.get("sessionsLimit") ?? query.get("sessions_limit"), 320, 1000);
+        const activityLimit = deps.parsePositiveInt(query.get("activityLimit") ?? query.get("activity_limit"), 600, 2000);
+        const decisionsLimit = deps.parsePositiveInt(query.get("decisionsLimit") ?? query.get("decisions_limit"), 120, 500);
         const initiative = query.get("initiative");
         const scope = resolveWorkspaceScope(query, headerScope, {
             allowProjectScope: false,
@@ -450,29 +450,7 @@ export function registerLiveSnapshotRoutes(router, deps) {
         try {
             const buffered = await deps.readOutboxItems();
             if (buffered.length > 0) {
-                const merged = [...activity, ...buffered]
-                    .sort((a, b) => {
-                    const d = Date.parse(b.timestamp) - Date.parse(a.timestamp);
-                    if (d !== 0)
-                        return d;
-                    return b.id.localeCompare(a.id);
-                })
-                    .slice(0, activityLimit);
-                const deduped = [];
-                const seenIds = new Set();
-                const seenSemantic = new Set();
-                for (const item of merged) {
-                    if (seenIds.has(item.id))
-                        continue;
-                    seenIds.add(item.id);
-                    const sk = deps.semanticActivityKey(item);
-                    if (sk && seenSemantic.has(sk))
-                        continue;
-                    if (sk)
-                        seenSemantic.add(sk);
-                    deduped.push(item);
-                }
-                activity = deduped;
+                activity = deps.mergeActivities(activity, buffered, activityLimit);
             }
         }
         catch (err) {
@@ -500,6 +478,9 @@ export function registerLiveSnapshotRoutes(router, deps) {
             agents: agentContexts,
             runs: runContexts,
         });
+        // Final dedup pass after enrichment — catches items that became
+        // semantically identical after runtime/agent context decoration.
+        activity = deps.mergeActivities(activity, [], activityLimit);
         activity = activity.filter((item) => !shouldHideActivityItem(item));
         sessions = normalizeReportingBlockedSessions({
             sessions,
@@ -542,6 +523,14 @@ export function registerLiveSnapshotRoutes(router, deps) {
             projectId,
             degraded: degraded.length > 0 ? degraded : undefined,
         };
+        if (typeof deps.getCanonicalAutopilotState === "function" && initiative) {
+            try {
+                payload.autopilot = deps.getCanonicalAutopilotState(initiative) ?? null;
+            }
+            catch {
+                // best effort
+            }
+        }
         if (typeof deps.listChatThreads === "function") {
             try {
                 const listed = deps.listChatThreads({

package/dist/http/routes/mission-control-actions.d.ts

@@ -66,6 +66,12 @@ type RegisterMissionControlActionsRoutesDeps<TReq, TRes> = {
     }>;
     tickAutoContinueRun: (run: any) => Promise<void>;
     stopAutoContinueRun: (input: any) => Promise<void>;
+    skipCurrentWorkstream: (initiativeId: string, workstreamId: string, reason?: string) => Promise<{
+        ok: boolean;
+        skippedWorkstreamId: string;
+        nextWorkstreamId?: string;
+        nextWorkstreamTitle?: string;
+    }>;
     updateInitiativeAutoContinueState: (input: any) => Promise<void>;
     tickAllAutoContinue: () => Promise<void>;
     scheduleAutoFixForWorkstream: (input: {