mixdog 0.9.93 → 0.9.94

package/src/runtime/shared/task-notification-envelope.mjs

@@ -24,6 +24,15 @@ export {
   backgroundTaskHeaderStatus,
 };
 
+// The full command is already visible in the start response / task record;
+// the envelope only needs an identifying prefix. Flatten whitespace and cap
+// so multi-line commands do not re-echo hundreds of chars per notification.
+function compactCommand(command) {
+  if (!command) return null;
+  const flat = String(command).replace(/\s+/g, ' ').trim();
+  return flat.length > 160 ? `${flat.slice(0, 160)}…` : flat;
+}
+
 // Render the bracketed shell *completion* envelope body.
 // Byte-compatible with the historical inline assembly in shell-jobs.fire().
 export function renderShellCompletionEnvelope({
@@ -42,7 +51,7 @@ export function renderShellCompletionEnvelope({
     `[status: ${status}]`,
     `[exit: ${exitCode === null ? 'n/a' : exitCode}]`,
     elapsedMs !== null ? `[elapsed: ${elapsedMs} ms]` : null,
-    command ? `[command: ${command}]` : null,
+    command ? `[command: ${compactCommand(command)}]` : null,
   ].filter((l) => l !== null);
   const bodySections = [
     summary ? `Summary: ${summary}` : null,
@@ -86,7 +95,7 @@ export function renderShellPromptStallEnvelope({
     '[status: running]',
     `[stalled: no output growth for ${stalledMs} ms]`,
     (elapsedMs !== null && elapsedMs >= 0) ? `[elapsed: ${elapsedMs} ms]` : null,
-    command ? `[command: ${command}]` : null,
+    command ? `[command: ${compactCommand(command)}]` : null,
     '',
     'This background shell task appears to be waiting for interactive input. Background tasks cannot answer prompts automatically; cancel it or rerun with non-interactive flags/input.',
     tailText ? `\n${tailText}` : null,

package/src/runtime/shared/tool-card-model.mjs

@@ -160,9 +160,13 @@ export function shellDisplayStatus({ pending = false, failedCount = 0, exitFaile
   return 'completed';
 }
 
-export function shellHeader(status, count = 1) {
+export function shellHeader(status, count = 1, verifying = false) {
   const n = Math.max(1, Number(count) || 1);
   const object = `${n} ${plural(n, 'command')}`;
+  // A shell that follows an edit in the same batch IS the verification —
+  // label it as such while healthy; failures keep the neutral Ran + detail.
+  if (verifying && status === 'running') return `Verifying ${object}`;
+  if (verifying && status === 'completed') return `Verified ${object}`;
   if (status === 'running') return `Running ${object}`;
   return `Ran ${object}`;
 }
@@ -708,7 +712,7 @@ export function deriveToolCardModel(input = {}, options = {}) {
   if (isAgentResponse) labelText = agentResponseTitle(parsedArgs, groupCount);
   else if (isBackgroundResponse) labelText = backgroundTaskResultTitle(normalizedName, backgroundMeta || parsedArgs);
   else if (isBackgroundMetadataResult) labelText = backgroundTaskActionTitle(normalizedName, backgroundMeta);
-  else if (isShellSurface) labelText = shellHeader(shellStatus, groupCount);
+  else if (isShellSurface) labelText = shellHeader(shellStatus, groupCount, parsedArgs?.verifyShell === true);
   else labelText = (isAgentTool(normalizedName) ? agentActionTitle(parsedArgs) : '')
     || formatToolActionHeader(name, args, { pending: headerPending, count: groupCount });
   labelText = safeInlineText(labelText);

package/src/runtime/shared/tool-surface.mjs

@@ -467,10 +467,15 @@ export function toolWorkUnit(name, args = {}, category = '') {
           noun: 'file',
         });
       }
+      // post_shell runs a verification command inside the SAME tool call after
+      // the patch applies; without the suffix the spinner sits on "Editing 1
+      // file" for the whole (possibly long) verify run and reads like a stuck
+      // edit. Surface both phases in the active label.
+      const verifying = typeof a.post_shell === 'string' && a.post_shell.trim() !== '';
       return unitDescriptor('Patch', {
         count: patchFileCount(a) || 1,
-        active: creating ? 'Creating' : deleting ? 'Deleting' : 'Editing',
-        done: creating ? 'Created' : deleting ? 'Deleted' : 'Edited',
+        active: (creating ? 'Creating' : deleting ? 'Deleting' : 'Editing') + (verifying ? ' & verifying' : ''),
+        done: (creating ? 'Created' : deleting ? 'Deleted' : 'Edited') + (verifying ? ' & verified' : ''),
         noun: 'file',
       });
     }

package/src/session-runtime/provider-usage.mjs

@@ -6,6 +6,10 @@
 // live-binding is preserved.
 import { clean } from './session-text.mjs';
 
+// A post-redeem dashboard rebuild is best effort: past this budget the caller
+// gets its confirmed outcome and the surface revalidates on its own cadence.
+const REDEEM_REFRESH_BUDGET_MS = 15_000;
+
 export function createProviderUsage({
   caches,
   getConfig,
@@ -134,9 +138,29 @@ export function createProviderUsage({
     const providerObj = reg().getProvider('openai-oauth');
     if (!providerObj) throw new Error('Codex is not signed in');
     const result = await consumeOpenAICodexResetCredit(providerObj, options);
+    // The redeem is DONE and its outcome is authoritative. Rebuilding the whole
+    // dashboard is a COURTESY refresh: it forces a sweep across every provider,
+    // so binding the answer to it once turned a spent credit into "reset could
+    // not be confirmed" whenever that sweep was slow or failed.
     caches.usageDashboardCache = {};
-    const dashboard = await getUsageDashboard({ refresh: true, refreshSetup: false });
-    return { ...result, dashboard };
+    const dashboard = await refreshedUsageDashboardWithin(REDEEM_REFRESH_BUDGET_MS);
+    return { ...result, ...(dashboard ? { dashboard } : {}) };
+  }
+
+  async function refreshedUsageDashboardWithin(budgetMs) {
+    let timer = null;
+    const budget = new Promise((resolve) => {
+      timer = setTimeout(() => resolve(null), budgetMs);
+      timer?.unref?.();
+    });
+    try {
+      return await Promise.race([
+        getUsageDashboard({ refresh: true, refreshSetup: false }).catch(() => null),
+        budget,
+      ]);
+    } finally {
+      if (timer) clearTimeout(timer);
+    }
   }
 
   return {

package/src/standalone/explore-tool.mjs

@@ -34,7 +34,7 @@ export const EXPLORE_TOOL = {
 // (50MB) plus a smart-read summariser downstream; the standalone path returns
 // the merged text in-turn, so we keep a sane bound to protect the Lead context.
 const EXPLORE_OUTPUT_CHAR_CAP = 24_000;
-const EXPLORE_TRUNCATION_MARKER = '\n\n[explore: output truncated; narrow cwd or split queries to see more]';
+const EXPLORE_TRUNCATION_MARKER = '\n\n[explore: output capped; remainder omitted]';
 // Bound fan-out so a hostile/poisoned query array cannot spawn unbounded subs.
 export const MAX_FANOUT_QUERIES = 8;
 // Mechanical turn cap per explorer sub-session: 3 free turns (contract: tool

package/src/tui/app/use-transcript-window.mjs

@@ -769,7 +769,13 @@ export function useTranscriptWindow({
     stopSmoothScroll();
     scrollTargetRef.current = desired;
     scrollPositionRef.current = Math.max(0, Math.min(maxRows, currentPosition + appliedDelta));
-    setScrollOffset(Math.max(0, Math.round(desired)));
+    // The render path already applied `desired` synchronously through the
+    // absolute anchor lock. Keep the refs as the committed scroll authority;
+    // mirroring the same correction back into React state from a layout effect
+    // creates a render → layout update feedback path when transcript geometry
+    // and viewport geometry change together (React #185). The next manual
+    // scroll writes state from these refs, while anchored renders continue to
+    // resolve directly from the current prefix table.
   }, [transcriptWindow.totalRows, transcriptWindow.maxScrollRows, transcriptRowIndex, transcriptContentHeight, scrollOffset, stopSmoothScroll]);
   useLayoutEffect(() => {
     if (transcriptAnchorRef.current || transcriptAnchorDirtyRef.current || followingRef.current) return;

package/src/tui/components/Spinner.jsx

@@ -44,19 +44,25 @@ const GLIMMER_SPEED_MS = { requesting: 70, reconnecting: 70, compacting: 120, 'a
 const GLIMMER_TRAIL = 4;
 const THINKING_GLIMMER_SPEED_MS = 120;
 const THINKING_GLIMMER_TRAIL = 4;
-const VERB_ROTATE_MIN_MS = 10000;
-const VERB_ROTATE_SPREAD_MS = 10000;
-const VERB_CHANGE_PROBABILITY = 0.65;
+// Fixed 30s cadence (user decision): the verb rotates deterministically every
+// 30 seconds instead of the earlier randomized 10–20s / 65% coin flip that
+// often never visibly fired.
+const VERB_ROTATE_MIN_MS = 30000;
+const VERB_ROTATE_SPREAD_MS = 0;
+const VERB_CHANGE_PROBABILITY = 1;
 
 const MODE_VERBS = {
-  requesting: ['Requesting', 'Preparing', 'Routing'],
+  requesting: ['Requesting'],
   compacting: ['Compacting conversation'],
   'auto-clear': ['Auto-clearing conversation'],
   resuming: ['Resuming conversation'],
-  thinking: ['Thinking', 'Reasoning', 'Mapping'],
-  'tool-use': ['Using tools', 'Checking files', 'Running tools', 'Reading output'],
-  'tool-input': ['Using tools', 'Checking files', 'Running tools', 'Reading output'],
-  responding: ['Responding', 'Composing', 'Writing', 'Wrapping up'],
+  // Conservative phrasing (user decision): each pool only rotates through
+  // synonyms of what the mode ACTUALLY means — never a concrete action the
+  // engine may not be doing (no "Checking files" during a web search).
+  thinking: ['Thinking', 'Considering', 'Organizing'],
+  'tool-use': ['Working', 'Running tools', 'Reviewing output'],
+  'tool-input': ['Working', 'Running tools', 'Reviewing output'],
+  responding: ['Writing', 'Wrapping up'],
 };
 
 function interpolateColor(a, b, t) {
@@ -232,7 +238,10 @@ export function Spinner({ verb = 'Working', startedAt, outputTokens = 0, tokens
   // --- Verb shimmer (traveling highlight) ---
   if (!displayVerbRef.current || displayVerbModeRef.current !== mode) {
     displayVerbRef.current = stableModeVerb(mode, verb);
-    nextVerbCheckRef.current = nextVerbCheckAt(now);
+    // Mode flips (thinking→tool-use→responding…) must NOT re-arm the timer:
+    // frequent flips otherwise reset the countdown forever and the rotation
+    // never fires. The cadence holds from the first mount of the turn.
+    if (!nextVerbCheckRef.current) nextVerbCheckRef.current = nextVerbCheckAt(now);
   }
   displayVerbModeRef.current = mode;
   if (now >= nextVerbCheckRef.current) {

package/src/tui/dist/index.mjs

@@ -5273,10 +5273,11 @@ function toolWorkUnit(name, args = {}, category = "") {
           noun: "file"
         });
       }
+      const verifying = typeof a.post_shell === "string" && a.post_shell.trim() !== "";
       return unitDescriptor("Patch", {
         count: patchFileCount(a) || 1,
-        active: creating ? "Creating" : deleting ? "Deleting" : "Editing",
-        done: creating ? "Created" : deleting ? "Deleted" : "Edited",
+        active: (creating ? "Creating" : deleting ? "Deleting" : "Editing") + (verifying ? " & verifying" : ""),
+        done: (creating ? "Created" : deleting ? "Deleted" : "Edited") + (verifying ? " & verified" : ""),
         noun: "file"
       });
     }
@@ -5927,18 +5928,21 @@ var GLIMMER_SPEED_MS = { requesting: 70, reconnecting: 70, compacting: 120, "aut
 var GLIMMER_TRAIL = 4;
 var THINKING_GLIMMER_SPEED_MS = 120;
 var THINKING_GLIMMER_TRAIL = 4;
-var VERB_ROTATE_MIN_MS = 1e4;
-var VERB_ROTATE_SPREAD_MS = 1e4;
-var VERB_CHANGE_PROBABILITY = 0.65;
+var VERB_ROTATE_MIN_MS = 3e4;
+var VERB_ROTATE_SPREAD_MS = 0;
+var VERB_CHANGE_PROBABILITY = 1;
 var MODE_VERBS = {
-  requesting: ["Requesting", "Preparing", "Routing"],
+  requesting: ["Requesting"],
   compacting: ["Compacting conversation"],
   "auto-clear": ["Auto-clearing conversation"],
   resuming: ["Resuming conversation"],
-  thinking: ["Thinking", "Reasoning", "Mapping"],
-  "tool-use": ["Using tools", "Checking files", "Running tools", "Reading output"],
-  "tool-input": ["Using tools", "Checking files", "Running tools", "Reading output"],
-  responding: ["Responding", "Composing", "Writing", "Wrapping up"]
+  // Conservative phrasing (user decision): each pool only rotates through
+  // synonyms of what the mode ACTUALLY means — never a concrete action the
+  // engine may not be doing (no "Checking files" during a web search).
+  thinking: ["Thinking", "Considering", "Organizing"],
+  "tool-use": ["Working", "Running tools", "Reviewing output"],
+  "tool-input": ["Working", "Running tools", "Reviewing output"],
+  responding: ["Writing", "Wrapping up"]
 };
 function interpolateColor(a, b, t) {
   return {
@@ -6062,7 +6066,7 @@ function Spinner({ verb = "Working", startedAt, outputTokens = 0, tokens = 0, th
   )) : theme.spinnerGlyph;
   if (!displayVerbRef.current || displayVerbModeRef.current !== mode) {
     displayVerbRef.current = stableModeVerb(mode, verb);
-    nextVerbCheckRef.current = nextVerbCheckAt(now);
+    if (!nextVerbCheckRef.current) nextVerbCheckRef.current = nextVerbCheckAt(now);
   }
   displayVerbModeRef.current = mode;
   if (now >= nextVerbCheckRef.current) {
@@ -16356,9 +16360,11 @@ function shellDisplayStatus({ pending = false, failedCount = 0, exitFailedCount
   if (isError || failedCount > 0) return "failed";
   return "completed";
 }
-function shellHeader(status, count = 1) {
+function shellHeader(status, count = 1, verifying = false) {
   const n = Math.max(1, Number(count) || 1);
   const object = `${n} ${plural(n, "command")}`;
+  if (verifying && status === "running") return `Verifying ${object}`;
+  if (verifying && status === "completed") return `Verified ${object}`;
   if (status === "running") return `Running ${object}`;
   return `Ran ${object}`;
 }
@@ -16825,7 +16831,7 @@ function deriveToolCardModel(input = {}, options = {}) {
   if (isAgentResponse) labelText = agentResponseTitle(parsedArgs, groupCount);
   else if (isBackgroundResponse) labelText = backgroundTaskResultTitle(normalizedName, backgroundMeta || parsedArgs);
   else if (isBackgroundMetadataResult) labelText = backgroundTaskActionTitle(normalizedName, backgroundMeta);
-  else if (isShellSurface) labelText = shellHeader(shellStatus, groupCount);
+  else if (isShellSurface) labelText = shellHeader(shellStatus, groupCount, parsedArgs?.verifyShell === true);
   else labelText = (isAgentTool(normalizedName) ? agentActionTitle(parsedArgs) : "") || formatToolActionHeader(name, args, { pending: headerPending, count: groupCount });
   labelText = safeInlineText(labelText);
   const toolSearchSummary = !pending && normalizedName === "load_tool" && hasResult ? toolSearchLoadedSummary(displayedResultText) : "";
@@ -22926,7 +22932,6 @@ function useTranscriptWindow({
     stopSmoothScroll();
     scrollTargetRef.current = desired;
     scrollPositionRef.current = Math.max(0, Math.min(maxRows, currentPosition + appliedDelta));
-    setScrollOffset(Math.max(0, Math.round(desired)));
   }, [transcriptWindow.totalRows, transcriptWindow.maxScrollRows, transcriptRowIndex, transcriptContentHeight, scrollOffset, stopSmoothScroll]);
   useLayoutEffect4(() => {
     if (transcriptAnchorRef.current || transcriptAnchorDirtyRef.current || followingRef.current) return;
@@ -27638,6 +27643,7 @@ function createRunTurn(bag) {
     const toolCards = [];
     const toolGroups = /* @__PURE__ */ new Map();
     const resultsDone = /* @__PURE__ */ new Set();
+    const postShellTwins = /* @__PURE__ */ new Map();
     let liveTailTimer = null;
     let lastLiveTailPatched = "";
     const clearLiveTailTimer = () => {
@@ -27898,7 +27904,10 @@ function createRunTurn(bag) {
     const syncAggregateHeader = (aggregate) => {
       if (!aggregate?.itemId) return;
       const patch = {
-        args: { categoryOrder: aggregate.categoryOrder.slice() },
+        args: {
+          categoryOrder: aggregate.categoryOrder.slice(),
+          ...aggregate.verifyShell ? { verifyShell: true } : {}
+        },
         count: aggregate.calls.size,
         completedCount: [...aggregate.calls.values()].filter((r) => r.resolved || r.completedEarly).length,
         categories: Object.fromEntries(aggregate.categories)
@@ -28111,7 +28120,41 @@ function createRunTurn(bag) {
     const deliverToolResultMessage = (message) => {
       if (message?.__earlyNotify === true) {
         const earlyCallId = toolResultCallId(message);
-        if (earlyCallId) markToolCardCompletedState(earlyCallId, message);
+        if (earlyCallId) {
+          markToolCardCompletedState(earlyCallId, message);
+          const earlyTwin = postShellTwins.get(earlyCallId);
+          if (earlyTwin) markToolCardCompletedState(earlyTwin, message);
+        }
+        return;
+      }
+      const parentCallId = toolResultCallId(message);
+      const twinCallId = parentCallId ? postShellTwins.get(parentCallId) : null;
+      if (twinCallId && !resultsDone.has(twinCallId)) {
+        const combined = String(toolResultText(message?.content) ?? "");
+        const headerMatch = combined.match(/\n+--- post_shell( FAILED[^\n]*)? ---\n?/);
+        const skippedMatch = headerMatch ? null : combined.match(/\n+--- post_shell skipped: patch failed ---\s*$/);
+        let patchPart = combined;
+        let shellPart = null;
+        if (headerMatch) {
+          patchPart = combined.slice(0, headerMatch.index);
+          shellPart = combined.slice(headerMatch.index + headerMatch[0].length);
+          if (headerMatch[1]) shellPart = `Error: post_shell FAILED (patch is applied; fix and re-verify)
+${shellPart}`;
+        } else if (skippedMatch) {
+          patchPart = combined.slice(0, skippedMatch.index);
+          shellPart = "Error: post_shell skipped: patch failed";
+        }
+        if (shellPart !== null) {
+          flushToolResults([
+            { role: "tool", tool_call_id: parentCallId, content: patchPart },
+            { role: "tool", tool_call_id: twinCallId, content: shellPart }
+          ], toolCards, cardByCallId, toolGroups, resultsDone);
+          return;
+        }
+        flushToolResults([
+          message,
+          { role: "tool", tool_call_id: twinCallId, content: "(post_shell output included in the patch result above)" }
+        ], toolCards, cardByCallId, toolGroups, resultsDone);
         return;
       }
       flushToolResults([message], toolCards, cardByCallId, toolGroups, resultsDone);
@@ -28154,6 +28197,25 @@ function createRunTurn(bag) {
           }
           const batchCalls = (calls || []).filter(Boolean);
           if (batchCalls.length === 0) return;
+          const displayCalls = [];
+          for (const c of batchCalls) {
+            displayCalls.push(c);
+            if (toolCallName(c) !== "apply_patch") continue;
+            let patchCallArgs = toolCallArgs(c);
+            if (typeof patchCallArgs === "string") {
+              try {
+                patchCallArgs = JSON.parse(patchCallArgs);
+              } catch {
+                patchCallArgs = null;
+              }
+            }
+            const postShellCmd = typeof patchCallArgs?.post_shell === "string" ? patchCallArgs.post_shell.trim() : "";
+            const parentCallId = toolCallId(c);
+            if (!postShellCmd || !parentCallId) continue;
+            const twinCallId = `${parentCallId}::post_shell`;
+            postShellTwins.set(parentCallId, twinCallId);
+            displayCalls.push({ id: twinCallId, name: "shell", args: { command: postShellCmd } });
+          }
           const agentBatch = ++providerToolBatch;
           const committedAssistantSegment = commitAssistantSegment({ sealToolBlock: true });
           if (committedAssistantSegment) {
@@ -28162,11 +28224,14 @@ function createRunTurn(bag) {
           }
           const touchedAggregates = /* @__PURE__ */ new Set();
           let standaloneReserve = null;
-          for (let i = 0; i < batchCalls.length; i++) {
-            const c = batchCalls[i];
+          let sawEditInBatch = false;
+          for (let i = 0; i < displayCalls.length; i++) {
+            const c = displayCalls[i];
             const name = toolCallName(c);
             const args = toolCallArgs(c);
             const category = classifyToolCategory(name, args);
+            const shellAfterEdit = category === "Shell" && sawEditInBatch;
+            if (category === "Patch" && args?.dry_run !== true) sawEditInBatch = true;
             const bucket = aggregateBucketForCategory(category, { agentBatch });
             const callId = toolCallId(c);
             const callKey = callId || `__tool_${toolCards.length}_${i}`;
@@ -28204,6 +28269,7 @@ function createRunTurn(bag) {
             }
             const categoryEntry = aggregateToolCategoryEntry(name, args, category);
             const aggregateCard = ensureAggregateCard(bucket);
+            if (shellAfterEdit) aggregateCard.verifyShell = true;
             if (!aggregateCard.categories.has(categoryEntry.key)) aggregateCard.categoryOrder.push(categoryEntry.key);
             const prevCategory = aggregateCard.categories.get(categoryEntry.key);
             aggregateCard.categories.set(categoryEntry.key, {
@@ -29956,6 +30022,10 @@ function createEngineApiA(bag) {
     },
     setCwd: (path4, options = {}) => {
       const next = runtime.setCwd(path4);
+      try {
+        touchProjectSelected(next);
+      } catch {
+      }
       const sessionList = recomputePromptHistory(getState().items);
       set({ cwd: next, promptHistoryList: buildMergedPromptHistory(sessionList, loadPromptHistory(next)) });
       if (options?.notice !== false) {
@@ -30659,7 +30729,12 @@ function createLiveShare({
       });
       attachLineReader(socket, (frame) => {
         if (frame.t === "submit" && typeof frame.text === "string" && frame.text.trim()) {
-          onRemoteSubmit(frame.text);
+          const id2 = typeof frame.id === "string" && frame.id.trim() ? frame.id : void 0;
+          const submittedAt = Number(frame.submittedAt);
+          onRemoteSubmit(frame.text, {
+            ...id2 ? { id: id2 } : {},
+            ...Number.isFinite(submittedAt) && submittedAt > 0 ? { submittedAt: Math.round(submittedAt) } : {}
+          });
         } else if (frame.t === "abort") {
           onRemoteAbort?.();
         } else if (frame.t === "sync") {
@@ -30960,10 +31035,17 @@ function createLiveShare({
     ensure: ensureShare,
     viewerConnected: () => clientUp,
     waitForViewerSync,
-    sendSubmit(text) {
+    sendSubmit(text, meta = null) {
       if (!clientUp || !client) return false;
       try {
-        client.write(frameLine({ t: "submit", text: String(text) }));
+        const id = meta && meta.id != null && String(meta.id).trim() ? String(meta.id) : void 0;
+        const submittedAt = Number(meta?.submittedAt);
+        client.write(frameLine({
+          t: "submit",
+          text: String(text),
+          ...id ? { id } : {},
+          ...Number.isFinite(submittedAt) && submittedAt > 0 ? { submittedAt: Math.round(submittedAt) } : {}
+        }));
         return true;
       } catch {
         return false;
@@ -32098,9 +32180,9 @@ async function createEngineSession({
     socketPathFor: (id) => liveSharePipePath(id, sessionPath(id)),
     getPublishedState: () => publishedState,
     listeners,
-    onRemoteSubmit: (text) => {
+    onRemoteSubmit: (text, meta) => {
       if (flags.disposed || state.sessionRemoteAttached) return;
-      bag.enqueue(text);
+      bag.enqueue(text, meta && meta.id ? { id: meta.id, submittedAt: meta.submittedAt } : {});
       void bag.drain();
     },
     onRemoteAbort: () => {
@@ -32147,7 +32229,7 @@ async function createEngineSession({
           liveShare.ensure();
         } catch {
         }
-        if (text && liveShare.sendSubmit(text)) return true;
+        if (text && liveShare.sendSubmit(text, { id: options.id, submittedAt: options.submittedAt })) return true;
         return runtime.enqueueRemoteAttachedPrompt?.(prompt) === true;
       }
       return baseSubmit(prompt, options);
@@ -32176,7 +32258,7 @@ async function createEngineSession({
       reconcileLiveShareNow();
       if (method === "resume" && result === true && state.sessionRemoteAttached) {
         const id = String(state.sessionId || "");
-        if (id && await liveShare.waitForViewerSync(id)) bag.flushEmit();
+        if (id && await liveShare.waitForViewerSync(id, 400)) bag.flushEmit();
       }
       return result;
     };
@@ -32694,6 +32776,10 @@ async function runTui({ provider, model, toolMode, remote, forceOnboarding } = {
     const outcome = await storeOutcomePromise;
     if (outcome.error) throw outcome.error;
     store = outcome.store;
+    try {
+      touchProjectSelected(store.getState?.()?.cwd || process.cwd());
+    } catch {
+    }
     bootProfile2("store:ready", { ms: (performance4.now() - startedAt).toFixed(1) });
   } catch (error) {
     splash.stop();

package/src/tui/engine/live-share.mjs

@@ -287,7 +287,18 @@ export function createLiveShare({
       });
       attachLineReader(socket, (frame) => {
         if (frame.t === 'submit' && typeof frame.text === 'string' && frame.text.trim()) {
-          onRemoteSubmit(frame.text);
+          // Optional submission metadata (additive, old viewers omit it): the
+          // originating surface's submission id must survive the pipe so its
+          // optimistic user row releases when the SAME id settles in the
+          // owner's transcript (user: 방금 친 메세지가 2개 남는다).
+          const id = typeof frame.id === 'string' && frame.id.trim() ? frame.id : undefined;
+          const submittedAt = Number(frame.submittedAt);
+          onRemoteSubmit(frame.text, {
+            ...(id ? { id } : {}),
+            ...(Number.isFinite(submittedAt) && submittedAt > 0
+              ? { submittedAt: Math.round(submittedAt) }
+              : {}),
+          });
         } else if (frame.t === 'abort') {
           // Viewer stop button: interrupt the owner's active turn here — the
           // viewer process has no turn of its own to cancel.
@@ -589,10 +600,19 @@ export function createLiveShare({
     ensure: ensureShare,
     viewerConnected: () => clientUp,
     waitForViewerSync,
-    sendSubmit(text) {
+    sendSubmit(text, meta = null) {
       if (!clientUp || !client) return false;
       try {
-        client.write(frameLine({ t: 'submit', text: String(text) }));
+        const id = meta && meta.id != null && String(meta.id).trim() ? String(meta.id) : undefined;
+        const submittedAt = Number(meta?.submittedAt);
+        client.write(frameLine({
+          t: 'submit',
+          text: String(text),
+          ...(id ? { id } : {}),
+          ...(Number.isFinite(submittedAt) && submittedAt > 0
+            ? { submittedAt: Math.round(submittedAt) }
+            : {}),
+        }));
         return true;
       } catch {
         return false;

package/src/tui/engine/session-api.mjs

@@ -8,6 +8,7 @@ import { createEngineApiB } from './session-api-ext.mjs';
 import { buildDoctorReport } from '../app/doctor.mjs';
 import { recomputePromptHistory } from './prompt-history.mjs';
 import { buildMergedPromptHistory, loadPromptHistory } from '../prompt-history-store.mjs';
+import { touchProjectSelected } from '../../standalone/projects.mjs';
 
 // Upper bound on how long a manual Esc abort may leave the store busy while the
 // in-flight runtime.ask() unwinds. runtime.abort() normally rejects the pending
@@ -255,6 +256,12 @@ export function createEngineApiA(bag) {
     },
     setCwd: (path, options = {}) => {
       const next = runtime.setCwd(path);
+      // "Last opened" recency belongs to the ACTUAL cwd switch, not to one
+      // caller: the project picker, its Current Path row and the /cwd prompt
+      // all land here, so the project list stays ordered by what was really
+      // opened last. Unregistered folders are ignored — this never registers
+      // a project on its own (addProject remains the only registration path).
+      try { touchProjectSelected(next); } catch { /* best-effort recency */ }
       // Republish up-arrow history for the NEW project: current session prompts
       // merged with the cwd-scoped persisted store for the new cwd.
       const sessionList = recomputePromptHistory(getState().items);