newmark-agent 0.5.4 → 0.5.7

package/dist/ui/lucide-sprite.svg

@@ -220,6 +220,10 @@
     <symbol id="minus" viewBox="0 0 24 24">
       <path d="M5 12h14" />
     </symbol>
+    <symbol id="mouse" viewBox="0 0 24 24">
+      <rect x="5" y="2" width="14" height="20" rx="7" />
+      <path d="M12 6v4" />
+    </symbol>
     <symbol id="move" viewBox="0 0 24 24">
       <path d="M12 2v20" />
       <path d="m15 19-3 3-3-3" />

package/dist/wsl-agent-host.bundle.cjs

@@ -328674,7 +328674,7 @@ function providerStreamTimeoutError(timeoutMs) {
   error.message = `Stream read timeout after ${timeoutMs}ms`;
   return error;
 }
-async function readProviderStreamChunk(reader, signal, timeoutMs = 3e4) {
+async function readProviderStreamChunk(reader, signal, timeoutMs = 0) {
   if (signal.aborted) throw providerAbortError(signal);
   let timer;
   let onAbort;
@@ -328682,9 +328682,9 @@ async function readProviderStreamChunk(reader, signal, timeoutMs = 3e4) {
     onAbort = () => reject(providerAbortError(signal));
     signal.addEventListener("abort", onAbort, { once: true });
   });
-  const timeoutPromise = new Promise((_3, reject) => {
+  const timeoutPromise = timeoutMs > 0 ? new Promise((_3, reject) => {
     timer = setTimeout(() => reject(providerStreamTimeoutError(timeoutMs)), timeoutMs);
-  });
+  }) : new Promise(() => void 0);
   try {
     return await Promise.race([reader.read(), abortPromise, timeoutPromise]);
   } catch (error) {
@@ -340861,7 +340861,13 @@ async function runAgentKernel(agent) {
       agent.recordWorkStatus("Final visual fallback used: local mini OCR plus conservative text correction.");
     }
     if (modelBeforeKernelRun && modelBeforeKernelRun !== agent.model && !tokens.some((t3) => t3.text?.includes("[Model fallback]"))) {
-      tokens.unshift({ type: "text", text: `[Model fallback] ${modelBeforeKernelRun} unavailable; switched to ${agent.model}.` });
+      const notice = `[Model fallback] ${modelBeforeKernelRun} unavailable; switched to ${agent.model}.`;
+      tokens.unshift({ type: "text", text: notice });
+      agent.emitWorkEvent({
+        type: "status",
+        content: notice,
+        fallback: { from: modelBeforeKernelRun, to: agent.model, providerId: agent.activeDeployment()?.providerId }
+      });
     }
     let emptyResponseRetries = 0;
     while (providerTurnIsEmpty(lastTurn) && emptyResponseRetries < 2) {
@@ -340882,6 +340888,11 @@ async function runAgentKernel(agent) {
       const notice = routeTransitionNotice(agent, previous);
       tokens.push({ type: "text", text: notice });
       agent.recordWorkStatus(notice);
+      agent.emitWorkEvent({
+        type: "status",
+        content: notice,
+        fallback: { from: previous, to: agent.model, providerId: agent.activeDeployment()?.providerId }
+      });
       kernel2.state.model = toKernelModel(agent);
       const fallbackToolSurface = refreshToolSurface(true);
       kernel2.state.systemPrompt = [agent.buildSystemPrompt(), fallbackToolSurface.systemPromptNotice].filter(Boolean).join("\n\n");
@@ -343306,14 +343317,16 @@ var AutoRouter = class {
         retryDelayMs
       });
     }
+    if (failure.allowModelFallback === false) return attempts.slice(0, remainingAttempts);
     const selection = decision.requestedSelection;
     if (selection.kind === "fixed") return attempts.slice(0, remainingAttempts);
     const scope = selection.kind === "auto" ? selection.scope : { kind: "provider", providerId: current.providerId };
     const subset = selection.kind === "auto" ? selection.subset : void 0;
     const currentGroup = current.logicalModelGroupId;
+    const currentProviderId = current.providerId;
     const now2 = this.now();
     const attemptedDeployments = decision.attempts.map((attempt) => attempt.deployment);
-    const eligible = candidates.filter((candidate) => candidate.enabled && inScope(candidate.deployment, scope) && inSubset(candidate.deployment, subset) && !sameDeployment(candidate.deployment, current) && !attemptedDeployments.some((attempted) => sameDeployment(candidate.deployment, attempted)) && validationEligible(candidate, now2).length === 0 && this.passedInitialHardFilters(decision, candidate) && this.circuitState(candidate.deployment, now2, false) !== "open");
+    const eligible = candidates.filter((candidate) => candidate.enabled && candidate.deployment.providerId === currentProviderId && inScope(candidate.deployment, scope) && inSubset(candidate.deployment, subset) && !sameDeployment(candidate.deployment, current) && !attemptedDeployments.some((attempted) => sameDeployment(candidate.deployment, attempted)) && validationEligible(candidate, now2).length === 0 && this.passedInitialHardFilters(decision, candidate) && this.circuitState(candidate.deployment, now2, false) !== "open");
     const equivalent = currentGroup ? eligible.find((candidate) => candidate.deployment.logicalModelGroupId === currentGroup && !candidate.fallbackOnly) : void 0;
     const fallback = eligible.find((candidate) => candidate.fallbackOnly);
     const rankedAlternates = decision.rankedCandidates.map((ranked) => eligible.find((candidate) => sameDeployment(candidate.deployment, ranked.deployment))).filter((candidate) => !!candidate && candidate !== equivalent && candidate !== fallback && !candidate.fallbackOnly);
@@ -346751,7 +346764,8 @@ ${String(event.toolArgs || "")}`;
       sequence,
       status: input2.status,
       guide: !isToolEvent && input2.guide ? this.normalizeGuideReceipt(input2.guide) : void 0,
-      displayImage: isToolEvent ? this.hydrateDisplayImage(input2.displayImage) : void 0
+      displayImage: isToolEvent ? this.hydrateDisplayImage(input2.displayImage) : void 0,
+      fallback: input2.fallback
     };
     if (activeRun && this.isPersistablePublicWorkEvent(event)) {
       activeRun.sequence = Number(sequence || activeRun.sequence + 1);
@@ -349670,9 +349684,15 @@ ${summary}`, segment, "local-summarize", true);
   }
   compressionBuildBlockStart(messages) {
     const activeRunId = this.currentWorkRunId();
-    if (!activeRunId) return 0;
-    const index = messages.findIndex((message) => String(message.run_id || message.runId || "") === activeRunId);
-    return index >= 0 ? index : 0;
+    if (activeRunId) {
+      const index = messages.findIndex((message) => String(message.run_id || message.runId || "") === activeRunId);
+      if (index >= 0) return index;
+    }
+    let lastRunBoundary = -1;
+    for (let index = 0; index < messages.length; index += 1) {
+      if (String(messages[index]?.run_id || messages[index]?.runId || "")) lastRunBoundary = index + 1;
+    }
+    return lastRunBoundary >= 0 ? lastRunBoundary : messages.length;
   }
   recentContextSuffix(messages, maxMessages, tokenBudget) {
     if (!messages.length) return [];
@@ -350601,17 +350621,12 @@ ${msg.content}
         currentAttempt.sideEffectBoundary = this.routeSideEffectCommitted;
         if (this.routeAttemptStartedAt > 0) currentAttempt.durationMs = Math.max(0, Date.now() - this.routeAttemptStartedAt);
       }
-      if (!fallbackEnabled) {
-        this.lastRouteDecision.finalStatus = "failed";
-        this.routeAttemptStartedAt = 0;
-        this.persistRouteDecision(this.lastRouteDecision);
-        return null;
-      }
       if (!this.pendingAutoAttempts.length) {
         this.pendingAutoAttempts = this.autoRouter.planAttempts(this.lastRouteDecision, this.autoRouteCandidates(), {
           error: failure,
           streamCommitted: this.routeStreamCommitted,
-          sideEffectCommitted: this.routeSideEffectCommitted
+          sideEffectCommitted: this.routeSideEffectCommitted,
+          allowModelFallback: fallbackEnabled
         });
       }
       const next2 = this.pendingAutoAttempts.shift();
@@ -350646,7 +350661,6 @@ ${msg.content}
     if (!next?.name) return null;
     this.model = next.name;
     this.fixedDeployment = this.deploymentRef(next);
-    if (next.provider) this.config.set("models", "auto_switch_anchor_provider", next.provider);
     return current;
   }
   isLlmErrorText(text) {
@@ -350654,12 +350668,10 @@ ${msg.content}
   }
   scopedSwitchModels(currentModelName) {
     const all = this.config.allModels();
-    if (this.config.autoSwitchScope() !== "provider") return all;
-    const current = currentModelName === "auto" ? void 0 : this.config.findModel(currentModelName);
-    const providerId = current?.provider_id || this.config.autoSwitchAnchorProvider() || this.config.findModel(this.config.getStr("models", "default_model"))?.provider_id || all[0]?.provider_id || "";
-    if (!providerId) return all;
-    const provider = this.config.findProvider(providerId);
-    return all.filter((m2) => m2.provider_id === (provider?.id || providerId));
+    const current = currentModelName === "auto" ? this.activeModelConfig() : this.config.findModel(currentModelName);
+    const providerId = current?.provider_id || this.fixedDeployment?.providerId || (currentModelName !== "auto" ? this.activeDeployment()?.providerId : void 0);
+    if (!providerId) return [];
+    return all.filter((m2) => m2.provider_id === providerId);
   }
   async validateModels(selectedNames, options = {}) {
     if (this.modelValidationPromise) return this.modelValidationPromise;
@@ -352041,7 +352053,10 @@ ${items.map((item) => this.formatAutomation(item)).join("\n")}`;
     if (!sa) return "[Subagent] Not found.";
     const requestedModel = this.normalizeSubagentModelSelection(sa.model && sa.model !== "default" ? sa.model : this.modelSelectionValue() || this.model);
     const requestedDeployment = parseDeploymentSelectionValue2(requestedModel);
-    const assignedModel = requestedModel === "auto" ? this.activeModelConfig() : requestedDeployment ? this.config.findDeployment(requestedDeployment) : this.config.findModel(requestedModel);
+    let assignedModel = requestedModel === "auto" ? this.activeModelConfig() : requestedDeployment ? this.config.findDeployment(requestedDeployment) : this.config.findModel(requestedModel);
+    if (!assignedModel && !requestedDeployment && requestedModel !== "auto") {
+      assignedModel = this.activeModelConfig();
+    }
     const model = assignedModel?.name || (requestedModel === "auto" ? this.activeModelName() : requestedModel);
     const activeModel = this.activeModelConfig();
     const activeProvider = this.engineModel();
@@ -353470,6 +353485,32 @@ var ConversationKernel = class {
       followUp: queued?.followUp.slice() || []
     };
   }
+  /**
+   * dev-0.5.6: 排队 followUp 消息 drain 时转成普通用户消息载荷。
+   *
+   * 入队时（enqueueSameSession）为去重/编辑保留了 clientMessageId，并把
+   * runId 固定为入队时运行的 runId；若原样传给 process，写入 chatMessages
+   * 的用户消息会携带旧 runId + clientMessageId，渲染端（PC renderTranscript /
+   * 移动端 projectRemoteConversationItems）会把「clientMessageId + runId 命中
+   * workRuns」的消息误判为 guide 消息而跳过气泡，导致排队自动发送的消息不
+   * 显示在用户输入时间线。清除这两个字段后 process 走普通用户消息分支
+   * （chatMessages.push，mode 取 visibleMode，runId 取当前 run）。
+   */
+  drainQueuedFollowUpMessage(message) {
+    if (typeof message === "string") return message;
+    const text = String(message.text || "");
+    const images = message.images;
+    const attachments = message.attachments;
+    const visible = message.visibleUserInput;
+    const visibleMode = message.visibleMode;
+    return {
+      text,
+      ...images?.length ? { images } : {},
+      ...attachments?.length ? { attachments } : {},
+      ...visible ? { visibleUserInput: visible } : {},
+      ...visibleMode ? { visibleMode } : {}
+    };
+  }
   queueItems(target) {
     const runtime = this.findRuntime(target);
     if (!runtime) return [];
@@ -354211,7 +354252,7 @@ ${batchText}`,
           };
           lastTokens = await this.runSingle(runtime, batchMessage, "steer");
         } else {
-          lastTokens = await this.runSingle(runtime, next.message, next.queueMode);
+          lastTokens = await this.runSingle(runtime, this.drainQueuedFollowUpMessage(next.message), next.queueMode);
         }
       }
       const rootMessage = runtime.runner.subagents.readRootInbox()[0];
@@ -354670,7 +354711,11 @@ ${text}`;
       type: "queue_update",
       content: "Conversation queue updated.",
       conversationId: runtime.id,
-      queue: this.queued(runtime.target)
+      queue: this.queued(runtime.target),
+      // Structured rows with stable kernel ids so every consumer (PC UI and
+      // the paired mobile client) can render/edit/delete the same items.
+      queueItems: this.queueItems(runtime.target),
+      queuePaused: runtime.queuePaused === true
     });
   }
   clearQueued(runtime) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "newmark-agent",
   "productName": "Newmark Agent",
-  "version": "0.5.4",
+  "version": "0.5.7",
   "description": "Newmark Agent — Portable AI coding agent with rich GUI and CLI (TypeScript)",
   "homepage": "https://github.com/positer/Newmark-Agent",
   "repository": {
@@ -53,7 +53,7 @@
     "test:desktop": "npm run build && node dist/tests/conversationHistoryFirstVerify.js && npm run test:desktop:built",
     "test:deletion-safety": "npm run build && npm run test:deletion-safety:built",
     "test:deletion-safety:built": "node scripts/deletion-safety-stress.cjs",
-    "test:desktop:built": "node dist/tests/verify.js && node dist/tests/thinkingTierMapCacheStressVerify.js && node dist/tests/computerUseSessionVerify.js && node dist/tests/contextSystemV2Verify.js && node dist/tests/contextSystemV2StressVerify.js && node dist/tests/providerAdapterV2Verify.js && node dist/tests/providerTimeoutRecoveryVerify.js && node dist/tests/agentRuntimeV2Verify.js && node dist/tests/toolchainExposureV2Verify.js && node dist/tests/localOcrFallbackVerify.js && node dist/tests/dev018ModeSubagentStressVerify.js && node dist/tests/conversationBranchStressVerify.js && node dist/tests/conversationArchiveConcurrencyVerify.js && node dist/tests/conversationArchiveRuntimeVerify.js && node dist/tests/dev040ComprehensiveStressVerify.js && node dist/tests/memoryPolicyVerify.js && node dist/tests/newmarkSelectVerify.js && node dist/tests/mcpManagerVerify.js && node dist/tests/dshCompatibilityVerify.js && node dist/tests/performanceOptimizationVerify.js && node scripts/compression-pressure-stress.cjs && node dist/tests/compressionFidelityVerify.js && node dist/tests/responseTrajectoryVerify.js && node dist/tests/normalChatRegressionVerify.js && node dist/tests/dev008-subagent.js && node dist/tests/dev009Verify.js && node dist/tests/runtimeIsolationVerify.js && node dist/tests/runtimePoolCapacityVerify.js && node dist/tests/guideWorkRunVerify.js && node dist/tests/modelSwitchBehaviorVerify.js && node scripts/flow-pause-stop-draft-stress.cjs && node dist/tests/guideUiReconcileVerify.js && node dist/tests/queueAttachmentIsolationVerify.js && node dist/tests/workspaceMenuVerify.js && node dist/tests/userImagePersistenceVerify.js && node dist/tests/displayImageVerify.js && node dist/tests/visualPreferencesVerify.js && node dist/tests/browserUseVerify.js && node dist/tests/toolProcessVerify.js && node dist/tests/toolProvisioningVerify.js && node dist/tests/taskToolsVerify.js && node dist/tests/contextCacheHitStressVerify.js && node dist/tests/startupPrewarmVerify.js && node dist/tests/pdfPreviewServerVerify.js && node dist/tests/editorLifecycleVerify.js && node dist/tests/terminalTakeoverVerify.js && node dist/tests/workspaceFileRouterVerify.js && node dist/tests/screenCaptureIndependentVerify.js && node dist/tests/computerUsePerformanceVerify.js && node dist/tests/autoRouterVerify.js && node dist/tests/autoAgentIntegrationVerify.js && node dist/tests/modelRecoveryStressVerify.js && node dist/tests/autoRouteRatingVerify.js && node dist/tests/providerIdentityVerify.js && node dist/tests/modelValidationVerify.js && node dist/tests/modelValidationAgentIntegrationVerify.js && node scripts/deletion-safety-stress.cjs",
+    "test:desktop:built": "node dist/tests/verify.js && node dist/tests/thinkingTierMapCacheStressVerify.js && node dist/tests/computerUseSessionVerify.js && node dist/tests/contextSystemV2Verify.js && node dist/tests/contextSystemV2StressVerify.js && node dist/tests/providerAdapterV2Verify.js && node dist/tests/providerTimeoutRecoveryVerify.js && node dist/tests/agentRuntimeV2Verify.js && node dist/tests/toolchainExposureV2Verify.js && node dist/tests/localOcrFallbackVerify.js && node dist/tests/dev018ModeSubagentStressVerify.js && node dist/tests/conversationBranchStressVerify.js && node dist/tests/conversationArchiveConcurrencyVerify.js && node dist/tests/conversationArchiveRuntimeVerify.js && node dist/tests/dev040ComprehensiveStressVerify.js && node dist/tests/memoryPolicyVerify.js && node dist/tests/newmarkSelectVerify.js && node dist/tests/mcpManagerVerify.js && node dist/tests/dshCompatibilityVerify.js && node dist/tests/performanceOptimizationVerify.js && node scripts/compression-pressure-stress.cjs && node dist/tests/compressionFidelityVerify.js && node dist/tests/responseTrajectoryVerify.js && node dist/tests/normalChatRegressionVerify.js && node dist/tests/dev008-subagent.js && node dist/tests/dev009Verify.js && node dist/tests/runtimeIsolationVerify.js && node dist/tests/runtimePoolCapacityVerify.js && node dist/tests/guideWorkRunVerify.js && node dist/tests/modelSwitchBehaviorVerify.js && node scripts/flow-pause-stop-draft-stress.cjs && node dist/tests/guideUiReconcileVerify.js && node dist/tests/workReviewDedupVerify.js && node dist/tests/queueAttachmentIsolationVerify.js && node dist/tests/queueDrainUserMessageVerify.js && node dist/tests/pcGlassMigrationVerify.js && node dist/tests/longHistoryDisplayVerify.js && node dist/tests/workspaceMenuVerify.js && node dist/tests/userImagePersistenceVerify.js && node dist/tests/displayImageVerify.js && node dist/tests/visualPreferencesVerify.js && node dist/tests/browserUseVerify.js && node dist/tests/toolProcessVerify.js && node dist/tests/toolProvisioningVerify.js && node dist/tests/taskToolsVerify.js && node dist/tests/contextCacheHitStressVerify.js && node dist/tests/startupPrewarmVerify.js && node dist/tests/pdfPreviewServerVerify.js && node dist/tests/editorLifecycleVerify.js && node dist/tests/terminalTakeoverVerify.js && node dist/tests/workspaceFileRouterVerify.js && node dist/tests/screenCaptureIndependentVerify.js && node dist/tests/computerUsePerformanceVerify.js && node dist/tests/autoRouterVerify.js && node dist/tests/autoAgentIntegrationVerify.js && node dist/tests/modelRecoveryStressVerify.js && node dist/tests/autoRouteRatingVerify.js && node dist/tests/providerIdentityVerify.js && node dist/tests/modelValidationVerify.js && node dist/tests/modelValidationAgentIntegrationVerify.js && node scripts/deletion-safety-stress.cjs",
     "test:conversation-branch-stress": "npm run build && node dist/tests/conversationBranchStressVerify.js",
     "test:conversation-archive-concurrency": "npm run build && node dist/tests/conversationArchiveConcurrencyVerify.js",
     "test:memory-policy": "npm run build && node dist/tests/memoryPolicyVerify.js",
@@ -126,6 +126,9 @@
     "release:ui-gemma-removal-smoke": "node scripts/release-ui-gemma-removal-smoke.cjs",
     "release:ui-icon-smoke": "node scripts/release-ui-icon-smoke.cjs",
     "release:ui-render-performance-smoke": "node scripts/release-ui-render-performance-smoke.cjs",
+    "test:liquid-renderer-calls": "node scripts/measure-liquid-renderer-calls.cjs",
+    "test:liquid-renderer-electron": "node scripts/dev-liquid-renderer-performance-smoke.cjs",
+    "release:ui-incremental-render-stress": "node scripts/release-ui-incremental-render-stress.cjs",
     "release:ui-flow-subagent-smoke": "node scripts/release-ui-flow-subagent-smoke.cjs",
     "release:ui-media-md-smoke": "node scripts/release-ui-media-md-smoke.cjs",
     "release:ui-native-editor-smoke": "node scripts/release-ui-native-editor-smoke.cjs",
@@ -184,7 +187,9 @@
     "dist:mac": "npm run build:clean && electron-builder --mac",
     "dist:windows-release": "npm run test:full-release && npm run build:clean && node scripts/dist-portable.cjs",
     "release:ocr-budget-smoke": "node scripts/verify-ocr-package-budget.cjs",
-    "release:packaged-ocr-smoke": "node scripts/release-packaged-ocr-smoke.cjs"
+    "release:packaged-ocr-smoke": "node scripts/release-packaged-ocr-smoke.cjs",
+    "test:stream-unlimited-timeout-stress": "npm run build && node dist/tests/streamUnlimitedTimeoutStressVerify.js",
+    "test:queue-unify-stress": "npm run build && node dist/tests/queueUnifyStressVerify.js && node dist/tests/queueDrainUserMessageVerify.js"
   },
   "build": {
     "npmRebuild": false,