@useorgx/openclaw-plugin 0.7.8 → 0.7.15

package/dist/http/helpers/queue-constants.js

@@ -0,0 +1,34 @@
+// ---------------------------------------------------------------------------
+// Canonical state constants for queue, lane, and related enumerations.
+// Use these instead of raw string literals throughout the codebase.
+// ---------------------------------------------------------------------------
+/** Queue state for next-up items (workstream-level). */
+export const QueueState = {
+    QUEUED: "queued",
+    RUNNING: "running",
+    BLOCKED: "blocked",
+    IDLE: "idle",
+    /** Used only in the API normalization layer (mission-control-read.ts). */
+    COMPLETED: "completed",
+};
+/** Auto-continue lane state (per-workstream within a run). */
+export const LaneState = {
+    IDLE: "idle",
+    RUNNING: "running",
+    BLOCKED: "blocked",
+    WAITING_DEPENDENCY: "waiting_dependency",
+    RATE_LIMITED: "rate_limited",
+    COMPLETED: "completed",
+};
+/** Auto-continue run status. */
+export const RunStatus = {
+    RUNNING: "running",
+    STOPPING: "stopping",
+    STOPPED: "stopped",
+};
+/** Runner source — how the agent was assigned. */
+export const RunnerSource = {
+    ASSIGNED: "assigned",
+    INFERRED: "inferred",
+    FALLBACK: "fallback",
+};

package/dist/http/helpers/slice-experience-v2.js

@@ -1,10 +1,7 @@
+import { asRecord } from "../../lib/type-coercion.js";
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const GENERIC_ACTOR_IDS = new Set(["main", "unknown", "system", "openclaw", "orgx"]);
-function asRecord(value) {
-    if (!value || typeof value !== "object" || Array.isArray(value))
-        return null;
-    return value;
-}
+// asRecord imported from ../../lib/type-coercion.js
 function normalizeText(value) {
     if (typeof value !== "string")
         return null;

package/dist/http/helpers/slice-run-projections.js

@@ -1,3 +1,4 @@
+import { asRecord } from "../../lib/type-coercion.js";
 const TERMINAL_STATES = new Set([
     "completed",
     "needs_review",
@@ -5,11 +6,7 @@ const TERMINAL_STATES = new Set([
     "archived",
 ]);
 const RUN_LIKE_STATUS = new Set(["dispatching", "running"]);
-function asRecord(value) {
-    if (!value || typeof value !== "object" || Array.isArray(value))
-        return null;
-    return value;
-}
+// asRecord imported from ../../lib/type-coercion.js
 function normalizeText(value) {
     if (typeof value !== "string")
         return null;

package/dist/http/helpers/workspace-scope.js

@@ -70,20 +70,21 @@ export function workspaceScopeFromHeaders(headers) {
         "x-orgx-command-center-id",
         "x_orgx_command_center_id",
     ]);
+    const centerId = readScopeValue(headers, ["center"]);
     if (workspaceId && commandCenterId && workspaceId !== commandCenterId) {
         return {
             workspace_id: workspaceId,
             command_center_id: commandCenterId,
-            center: workspaceId,
+            center: centerId ?? workspaceId,
         };
     }
-    const canonical = workspaceId ?? commandCenterId;
+    const canonical = workspaceId ?? commandCenterId ?? centerId;
     if (!canonical)
         return null;
     return {
         workspace_id: canonical,
         command_center_id: canonical,
-        center: canonical,
+        center: centerId ?? canonical,
     };
 }
 function mergeCandidates(payloadCandidates, queryCandidates) {

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";
@@ -106,8 +107,64 @@ async function resolveSkillPackOverrides(input) {
     }
 }
 function safeErrorMessage(err) {
-    const raw = err instanceof Error ? err.message : typeof err === "string" ? err : "";
-    const normalized = raw.trim().toLowerCase();
+    const raw = err instanceof Error
+        ? err.message
+        : typeof err === "string"
+            ? err
+            : err && typeof err === "object" && "message" in err && typeof err.message === "string"
+                ? (err.message ?? "")
+                : "";
+    const parseStructuredMessage = (value) => {
+        const trimmed = value.trim();
+        if (!trimmed)
+            return null;
+        const parseObjectMessage = (parsed) => {
+            if (!parsed || typeof parsed !== "object")
+                return null;
+            const root = parsed;
+            const nested = root.error && typeof root.error === "object" ? root.error : null;
+            const envelope = nested ?? root;
+            return ((typeof envelope.message === "string" && envelope.message.trim()) ||
+                (typeof envelope.detail === "string" && envelope.detail.trim()) ||
+                (!nested && typeof root.error === "string" && root.error.trim()) ||
+                null);
+        };
+        try {
+            const parsed = JSON.parse(trimmed);
+            const direct = parseObjectMessage(parsed);
+            if (direct)
+                return direct;
+        }
+        catch {
+            // Continue and try extracting embedded JSON payloads.
+        }
+        const firstBrace = trimmed.indexOf("{");
+        const lastBrace = trimmed.lastIndexOf("}");
+        if (firstBrace >= 0 && lastBrace > firstBrace) {
+            const candidate = trimmed.slice(firstBrace, lastBrace + 1);
+            try {
+                const parsed = JSON.parse(candidate);
+                return parseObjectMessage(parsed);
+            }
+            catch {
+                return null;
+            }
+        }
+        return null;
+    };
+    const stripStructuredNoise = (value) => value
+        .replace(/"requestId"\s*:\s*"[^"]*"/gi, "")
+        .replace(/"timestamp"\s*:\s*"[^"]*"/gi, "")
+        .replace(/"docsUrl"\s*:\s*"[^"]*"/gi, "")
+        .replace(/\brequest[_\s-]?id[:=]\s*[\w-]+/gi, "")
+        .replace(/\btimestamp[:=]\s*\S+/gi, "")
+        .replace(/\bdocsUrl[:=]\s*\S+/gi, "")
+        .replace(/[{}]/g, " ")
+        .replace(/\s{2,}/g, " ")
+        .trim();
+    const normalizedMessage = parseStructuredMessage(raw) ?? raw;
+    const sanitized = stripStructuredNoise(normalizedMessage);
+    const normalized = sanitized.toLowerCase();
     if (normalized.length > 0) {
         if (normalized.includes("signal is aborted") ||
             normalized.includes("aborterror") ||
@@ -121,7 +178,16 @@ function safeErrorMessage(err) {
         if (normalized.includes("failed to fetch") || normalized.includes("network")) {
             return "network request failed";
         }
-        return raw;
+        if (normalized.includes("relation does not exist")) {
+            return sanitized;
+        }
+        if (normalized.includes("internal_error") || normalized.includes("internal server error")) {
+            return "temporary server issue";
+        }
+        if (normalized.includes("failed to list decision") || normalized.includes("failed to load decision")) {
+            return "decision data temporarily unavailable";
+        }
+        return sanitized;
     }
     return "Unexpected error";
 }
@@ -318,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";
@@ -650,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) ??
@@ -693,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 [
@@ -707,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);
@@ -717,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;
@@ -2111,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;
         };
@@ -2260,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, {
@@ -2279,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({
@@ -2298,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] ??
@@ -2483,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)
@@ -2533,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
@@ -2564,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)))
@@ -2587,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);
@@ -2622,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";
@@ -2719,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 = [];
@@ -2752,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}`)),
@@ -3178,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,
@@ -3213,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,

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" ||

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

@@ -31,8 +31,15 @@ export function registerLiveMiscRoutes(router, deps) {
         const projectId = projectIdRaw?.trim() ?? "";
         if (!projectId)
             return null;
-        const ids = await deps.listInitiativeIdsForProject({ projectId });
-        return new Set(ids);
+        try {
+            const ids = await deps.listInitiativeIdsForProject({ projectId });
+            return new Set(ids);
+        }
+        catch {
+            // Scope discovery is best-effort. Continue with unscoped fallback data
+            // instead of hard-failing live surfaces.
+            return null;
+        }
     }
     router.add("POST", "live/activity/headline", async ({ req, res }) => {
         try {

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

@@ -13,7 +13,7 @@ const LIVE_SNAPSHOT_UPSTREAM_TIMEOUT_MS = (() => {
 const LIVE_SNAPSHOT_NEXT_UP_TIMEOUT_MS = (() => {
     const raw = Number(process.env.ORGX_LIVE_SNAPSHOT_NEXT_UP_TIMEOUT_MS ?? "");
     if (!Number.isFinite(raw))
-        return 1_200;
+        return 350;
     return Math.max(250, Math.min(15_000, Math.floor(raw)));
 })();
 async function withSoftTimeout(work, timeoutMs, label) {
@@ -280,9 +280,15 @@ export function registerLiveSnapshotRoutes(router, deps) {
         const agentContexts = contextStore.agents;
         const runContexts = contextStore.runs ?? {};
         const scopedAgentIds = deps.getScopedAgentIds(agentContexts);
-        const scopedProjectInitiativeIds = projectId && projectId.trim().length > 0
-            ? new Set(await deps.listInitiativeIdsForProject({ projectId: projectId.trim() }))
-            : null;
+        let scopedProjectInitiativeIds = null;
+        if (projectId && projectId.trim().length > 0) {
+            try {
+                scopedProjectInitiativeIds = new Set(await deps.listInitiativeIdsForProject({ projectId: projectId.trim() }));
+            }
+            catch (err) {
+                degraded.push(`workspace initiative scope unavailable (${deps.safeErrorMessage(err)})`);
+            }
+        }
         let outboxStatus;
         try {
             const diagnosticsOutbox = await deps.readDiagnosticsOutboxStatus();
@@ -444,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) {
@@ -494,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,