@logicseek/hello-cc 1.1.0-rc.3 → 1.1.0-rc.4

package/lib/web/ui-i18n.mjs

@@ -85,6 +85,7 @@ const coreTranslations = {
     'files.select': 'Choose a file to preview.',
     'files.mainWindowRequired': 'Open project files from the main window for this project.',
     'workspace.split': 'Split',
+    'workspace.requiresBrowserSession': 'Split requires a signed-in browser session. Restart Web with an access token and sign in.',
     'workspace.panes': 'Session panes',
     'workspace.primary': 'Main',
     'workspace.secondary': 'Second',
@@ -376,6 +377,7 @@ const coreTranslations = {
     'files.select': '选择文件以预览内容。',
     'files.mainWindowRequired': '请在此项目的主窗口中打开项目文件。',
     'workspace.split': '分屏',
+    'workspace.requiresBrowserSession': '分屏需要已登录的浏览器会话。请启用访问令牌后重启 Web 并登录。',
     'workspace.panes': '会话窗格',
     'workspace.primary': '主窗格',
     'workspace.secondary': '副窗格',
@@ -669,6 +671,7 @@ export const UI_TRANSLATIONS = Object.freeze({
     'native.output': 'Executor output',
     'native.draft': 'Message draft saved in this browser',
     'native.send': 'Queue message',
+    'native.retryPending': 'Retry same submission',
     'native.interrupt': 'Interrupt current turn',
     'native.read': 'Refresh receipts',
     'native.reviewPending': 'Reviewed; keep draft',
@@ -687,6 +690,7 @@ export const UI_TRANSLATIONS = Object.freeze({
     'native.closed': 'Executor closed.',
     'native.retained': 'Draft retained. A new send creates a new submission.',
     'native.reviewConfirm': 'Have you checked the durable receipts? A new send may duplicate work already queued. Keep this draft and remove its unconfirmed marker?',
+    'native.retryConfirm': 'Have you inspected the durable receipts? Retry this exact message with its original ID and worker; it will not create a second queue message, but provider execution may already be in progress.',
     'native.delivery.queued': 'Queued, awaiting dispatch',
     'native.delivery.dispatching': 'Submitting to executor',
     'native.delivery.submitted': 'Submitted, awaiting output',
@@ -931,6 +935,7 @@ export const UI_TRANSLATIONS = Object.freeze({
     'native.output': '执行器输出',
     'native.draft': '消息草稿保存在此浏览器',
     'native.send': '将消息加入队列',
+    'native.retryPending': '沿用原提交重试',
     'native.interrupt': '中断当前轮次',
     'native.read': '刷新回执',
     'native.reviewPending': '已核对，保留草稿',
@@ -949,6 +954,7 @@ export const UI_TRANSLATIONS = Object.freeze({
     'native.closed': '执行器已关闭。',
     'native.retained': '草稿已保留，再次发送会创建新提交。',
     'native.reviewConfirm': '是否已核对持久回执？再次发送可能重复已经排队的任务。保留草稿并清除未确认标记？',
+    'native.retryConfirm': '是否已核对持久回执？本操作会对原 worker 以原 ID 和原消息重试，不会创建第二条排队消息，但 provider 可能已经在执行。',
     'native.delivery.queued': '已排队，等待投递',
     'native.delivery.dispatching': '正在提交给执行器',
     'native.delivery.submitted': '已提交，等待输出',

package/lib/web/ui-native.mjs

@@ -35,7 +35,7 @@ export function nativePanelHtml() {
       <details id="nativeIdentityDetails" class="native-meta"><summary id="nativeIdentityLabel">Executor details</summary><p id="nativeIdentity"></p><p data-i18n="native.approvalPolicy">The current controller can answer interactive requests here.</p></details></div>
     <div id="nativeJumpBar" class="native-reading-jump" hidden><button id="nativeJump" type="button">Back to latest</button></div>
     <footer class="native-composer"><label for="nativeDraft" data-i18n="native.draft">Message draft saved in this browser</label><textarea id="nativeDraft" rows="3"></textarea>${sessionToolsHtml('native')}
-      <div class="native-controls"><button id="nativeSend" class="primary" type="button" data-i18n="native.send" disabled>Queue message</button><button id="nativeInterrupt" type="button" data-i18n="native.interrupt" disabled>Interrupt current turn</button><button id="nativeRead" type="button" data-i18n="native.read">Refresh receipts</button><button id="nativeReviewPending" type="button" data-i18n="native.reviewPending" hidden>Reviewed; keep draft</button></div>
+      <div class="native-controls"><button id="nativeSend" class="primary" type="button" data-i18n="native.send" disabled>Queue message</button><button id="nativeInterrupt" type="button" data-i18n="native.interrupt" disabled>Interrupt current turn</button><button id="nativeRead" type="button" data-i18n="native.read">Refresh receipts</button><button id="nativeRetryPending" type="button" data-i18n="native.retryPending" hidden>Retry same submission</button><button id="nativeReviewPending" type="button" data-i18n="native.reviewPending" hidden>Reviewed; keep draft</button></div>
       <div class="native-controls"><label><input id="nativeCloseConfirmed" type="checkbox"><span data-i18n="native.closeConfirm">Stop this executor</span></label><button id="nativeClose" class="danger" type="button" data-i18n="native.close" disabled>Close executor</button></div>
       <p id="nativeNotice" role="status" aria-live="polite"></p>
     </footer>
@@ -82,6 +82,10 @@ export function installNativePanel(installDependencies = true) {
       document.getElementById('nativeClose').disabled = !writable || sending || !document.getElementById('nativeCloseConfirmed').checked;
       document.getElementById('nativeReviewPending').hidden = !pending;
       document.getElementById('nativeReviewPending').disabled = sending;
+      document.getElementById('nativeRetryPending').hidden = !pending;
+      document.getElementById('nativeRetryPending').disabled = !writable || sending || !pending?.owner ||
+        pending.owner !== state?.owner || pending.generation !== state?.generation || !pending.text ||
+        state?.quarantined || state?.capabilities?.send === false;
       document.getElementById('nativeRead').disabled = bridge().session?.type !== 'native';
       document.getElementById('nativeApprovals').querySelectorAll('button[data-response]').forEach(button => {
         button.disabled = !writable || responding.has(button.dataset.requestKey) || (button.dataset.decision === 'accept' && button.dataset.truncated === 'true');
@@ -192,7 +196,7 @@ export function installNativePanel(installDependencies = true) {
     document.getElementById('nativeSend').addEventListener('click',async()=>{
       sync(); if (document.getElementById('nativeSend').disabled) return;
       const target = subject(), text = draft.value, id = 's_' + crypto.randomUUID(), version = observed;
-      pending = {id,text,generation:target.generation}; save(); inflight.add(target.key); sync(); notice(tr('native.sending'));
+      pending = {id,text,generation:target.generation,owner:target.owner}; save(); inflight.add(target.key); sync(); notice(tr('native.sending'));
       try {
         const result = await bridge().api(route(target,'send'),{method:'POST',body:JSON.stringify({text,submissionId:id,action_token:target.token,epoch:target.epoch})});
         const receipt = result.receipt || result;
@@ -202,6 +206,22 @@ export function installNativePanel(installDependencies = true) {
       } catch(error) { if (matches(target) && pending?.id === id) notice((error.detail || error.message) + ' ' + tr('native.uncertain')); }
       finally { inflight.delete(target.key); sync(); }
     });
+    document.getElementById('nativeRetryPending').addEventListener('click',async()=>{
+      sync(); if (document.getElementById('nativeRetryPending').disabled || !pending ||
+        !confirm(tr('native.retryConfirm'))) return;
+      const target = subject(), original = { ...pending }, version = observed;
+      inflight.add(target.key); sync(); notice(tr('native.sending'));
+      try {
+        const result = await bridge().api(route(target,'send'),{method:'POST',body:JSON.stringify({
+          text:original.text,submissionId:original.id,retry:true,action_token:target.token,epoch:target.epoch
+        })});
+        const receipt = result.receipt || result;
+        if (receipt.submission_id !== original.id || !Number.isSafeInteger(receipt.message_id)) throw new Error(tr('native.invalidReceipt'));
+        acknowledge(target,original.id);
+        if (matches(target) && version === observed) { if (result.state) render(result.state); else void read(); }
+      } catch(error) { if (matches(target) && pending?.id === original.id) notice((error.detail || error.message) + ' ' + tr('native.uncertain')); }
+      finally { inflight.delete(target.key); sync(); }
+    });
     document.getElementById('nativeInterrupt').addEventListener('click',async()=>{
       sync(); if (document.getElementById('nativeInterrupt').disabled) return;
       const target = subject(); inflight.add(target.key); sync();

package/lib/web/ui-template.mjs

@@ -21,7 +21,7 @@ function nonceAttribute(nonce) {
   return ` nonce="${value}"`;
 }
 
-export function webIndexHtml({ nonce, pane = false } = {}) {
+export function webIndexHtml({ nonce, pane = false, paneAllowed = false } = {}) {
   const inlineScriptNonce = nonceAttribute(nonce);
   return `<!doctype html>
 <html lang="en">
@@ -625,7 +625,7 @@ export function webIndexHtml({ nonce, pane = false } = {}) {
     ${agentDefaultsCss}
   </style>
 </head>
-<body>
+<body data-workspace-pane-allowed="${paneAllowed === true}">
   <header class="global-header">
     <strong>hello-cc</strong>
     <div class="header-controls">

package/lib/web/ui-workspace.mjs

@@ -92,6 +92,7 @@ function workspaceRuntime(normalize, validMessage) {
   const workspace = byId('workspace'), panes = byId('workspacePanes'), bar = byId('workspaceBar');
   const secondary = byId('workspaceSecondPane'), status = byId('workspaceStatus'), select = byId('workspaceSession');
   const divider = byId('workspaceDivider'), split = byId('splitBtn');
+  const paneAllowed = host.paneAllowed !== false;
   const mobile = window.matchMedia('(max-width:1099px)');
   let root = '', layout = normalize(null), frame = null, mounted = '', timer = 0, selectedPane = 'primary', resizing = false, applyingParentPreferences = false;
   const key = () => 'hcc.workspace:' + root;
@@ -123,7 +124,7 @@ function workspaceRuntime(normalize, validMessage) {
     host.layoutChanged();
   }
   function mount() {
-    if (!layout.open || !host.ready()) return;
+    if (!paneAllowed || !layout.open || !host.ready()) return;
     const session = host.sessions().find(item => item.id === layout.session && item.status === 'running');
     if (!session) {
       destroy(); status.hidden = false; status.textContent = tr('workspace.missing'); return;
@@ -145,7 +146,10 @@ function workspaceRuntime(normalize, validMessage) {
       try { layout = normalize(JSON.parse(ui.safeGet(key()) || 'null')); } catch (_) { layout = normalize(null); }
       selectedPane = 'primary';
     }
-    split.disabled = !host.ready() || !host.sessions().some(item => item.status === 'running');
+    // Keep saved layouts for a later signed-in page, without mounting a denied frame.
+    if (!paneAllowed) { layout.open = false; selectedPane = 'primary'; destroy(); }
+    split.disabled = !paneAllowed || !host.ready() || !host.sessions().some(item => item.status === 'running');
+    split.setAttribute('title', tr(paneAllowed ? 'workspace.split' : 'workspace.requiresBrowserSession'));
     const options = host.sessions().filter(item => item.status === 'running');
     const esc = host.esc;
     const html = options.map(item => '<option value="'+esc(item.id)+'">'+esc(item.name || item.task?.title || item.peer_id || item.id)+'</option>').join('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicseek/hello-cc",
-  "version": "1.1.0-rc.3",
+  "version": "1.1.0-rc.4",
   "description": "Local control plane for coordinating Claude Code, Codex, and other coding CLI sessions.",
   "type": "module",
   "bin": {

package/scripts/helpers/gc-clock-observation.mjs

@@ -0,0 +1,33 @@
+import assert from 'node:assert/strict';
+
+const observedAtKey = 'clock_last_observed_at';
+
+function timestamp(value, label) {
+  assert.ok(Number.isSafeInteger(value) && value >= 0, `${label} must be a nonnegative safe integer`);
+  return value;
+}
+
+function observedAt(rows, label) {
+  const matches = rows.filter(row => row.key === observedAtKey);
+  assert.equal(matches.length, 1, `${label} must contain exactly one clock observation`);
+  assert.match(matches[0].value, /^(0|[1-9]\d*)$/, `${label} clock observation must be a canonical timestamp`);
+  return timestamp(Number(matches[0].value), `${label} clock observation`);
+}
+
+// An active runtime observes its clock even when its reaper has no candidates.
+// Only that watermark may advance while the manual GC preview is in flight.
+export function assertGcPreviewMetadata(before, after, { startedAtSec, finishedAtSec }) {
+  timestamp(startedAtSec, 'preview start');
+  timestamp(finishedAtSec, 'preview finish');
+  assert.ok(finishedAtSec >= startedAtSec, 'preview time window must be monotonic');
+  assert.deepEqual(
+    after.filter(row => row.key !== observedAtKey),
+    before.filter(row => row.key !== observedAtKey),
+    'manual GC preview changed metadata other than the runtime clock observation'
+  );
+  const previous = observedAt(before, 'before preview');
+  const current = observedAt(after, 'after preview');
+  assert.ok(previous >= startedAtSec && previous <= finishedAtSec, 'initial clock observation is outside the preview time window');
+  assert.ok(current >= previous, 'runtime clock observation moved backward during the preview');
+  assert.ok(current <= finishedAtSec, 'runtime clock observation is beyond the preview time window');
+}

package/scripts/native-installed-acceptance.mjs

@@ -13,6 +13,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 import { DatabaseSync } from 'node:sqlite';
 import { setTimeout as delay } from 'node:timers/promises';
 import { nativeRequest } from '../lib/runtime/native/client.mjs';
+import { resolveProjectDatabase } from '../lib/runtime/project-path.mjs';
 import { readNativePointer, nativePaths } from '../lib/runtime/native/store.mjs';
 import { stabilityOptions, assertStabilityEvidence, stabilityPayload } from './native-stability-checks.mjs';
 import { redactSecrets } from '../lib/shared/redact.mjs';
@@ -39,7 +40,8 @@ const initialSources = sourceHashes();
 const sandbox = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'hcc-installed-native-')));
 fs.chmodSync(sandbox, 0o700);
 const root = path.join(sandbox, 'project');
-const ctx = { root, cwd: root, dbPath: path.join(root, '.hello-cc/mesh.db') };
+// Resolve the database only after this process shares the CLI's private HOME.
+const ctx = { root, cwd: root, dbPath: null };
 const output = path.resolve(option('--output', path.join(sandbox, 'receipt.json')));
 const report = { startedAt: new Date().toISOString(), scope: 'installed public CLI, authenticated lifecycle, cross-provider messages, optional browser, bounded coding task and opt-in sustained stability',
   package: { directory: repo, version: JSON.parse(fs.readFileSync(path.join(repo, 'package.json'))).version,
@@ -47,7 +49,10 @@ const report = { startedAt: new Date().toISOString(), scope: 'installed public C
   node: process.version, sandbox, providers: {}, checks: [], cleanup: {}, sourceFiles: initialSources,
   acceptanceMode: stabilityOnly ? 'stability-only' : 'full', factoryInjected: false, queryInjected: false, authentication: 'existing route copied into test-owned private homes', screenshots: [], pageErrors: [], consoleErrors: [], limitations: [] };
 const credentials = [];
-const originalCodexHome = process.env.CODEX_HOME || path.join(os.homedir(), '.codex');
+const credentialIdentities = new Map();
+const originalHomeEnv = process.env.HOME;
+const originalUserHome = fs.realpathSync(os.homedir());
+const originalCodexHome = path.resolve(process.env.CODEX_HOME || path.join(originalUserHome, '.codex'));
 const protectedFiles = ['config.toml', 'auth.json'].map(name => path.join(originalCodexHome, name)).filter(file => fs.existsSync(file));
 const protectedHashes = protectedFiles.map(file => [file, digest(file)]);
 let env, db, browser, runtimeStarted = false, webStarted = false;
@@ -58,14 +63,42 @@ const socket = `hcc-installed-${randomUUID()}`;
 const terminal = new Set(['completed', 'failed', 'uncertain']);
 function check(name, details = {}) { report.checks.push({ name, passed: true, ...details }); console.log(JSON.stringify({ check: name, ...details })); }
 function flush() { fs.mkdirSync(path.dirname(output), { recursive: true }); fs.writeFileSync(output, JSON.stringify(redactSecrets(report), null, 2) + '\n', { mode: 0o600 }); }
-function privateDir(name) { const dir = path.join(sandbox, name); credentials.push(dir); fs.mkdirSync(dir, { recursive: true, mode: 0o700 }); return dir; }
+function rememberCredentialDirectory(directory) {
+  const stat = fs.lstatSync(directory);
+  assert.ok(stat.isDirectory() && !stat.isSymbolicLink(), 'Credential cleanup needs an owned directory');
+  credentials.push(directory);
+  credentialIdentities.set(directory, { canonical: fs.realpathSync(directory), dev: stat.dev, ino: stat.ino });
+  return directory;
+}
+function privateDir(name) {
+  const directory = path.join(sandbox, name);
+  fs.mkdirSync(directory, { mode: 0o700 });
+  return rememberCredentialDirectory(directory);
+}
+function removeCredentialDirectory(directory) {
+  const saved = credentialIdentities.get(directory);
+  let current;
+  try { current = fs.lstatSync(directory); }
+  catch (error) { if (error.code === 'ENOENT') return; throw error; }
+  // Refuse a replaced directory or alias before deleting test credentials.
+  assert.ok(saved && current.isDirectory() && !current.isSymbolicLink() &&
+    current.dev === saved.dev && current.ino === saved.ino && fs.realpathSync(directory) === saved.canonical,
+  'Test credential directory changed identity; retained it for inspection');
+  fs.rmSync(directory, { recursive: true });
+}
 function hcc(...params) {
   const result = spawnSync(process.execPath, [cli, '--root', root, '--json', ...params], { cwd: root, env, encoding: 'utf8', timeout: 45000 });
-  if (result.status !== 0) throw new Error(`Installed CLI ${params.slice(0, 2).join(' ')} failed: ${redactSecrets(result.stderr || result.stdout)}`);
-  if (!result.stdout.trim()) return null;
-  if (params[0] !== 'native') return { output: result.stdout.trim() };
-  const reply = JSON.parse(result.stdout);
-  assert.equal(reply.ok, true, 'CLI response must confirm success');
+  const command = params[0] === 'native' ? `native ${params[1]}` : params[0];
+  const failure = code => Object.assign(new Error(`Installed CLI ${command} status=${Number.isInteger(result.status) ? result.status : 'unavailable'} code=${code}`), { code });
+  // CLI/provider output can contain credentials or arbitrary payloads. Keep
+  // failure receipts structural, including malformed successful-CLI output.
+  if (result.error || result.status !== 0) throw failure('HCC_CLI_EXIT_FAILED');
+  const stdout = typeof result.stdout === 'string' ? result.stdout.trim() : '';
+  if (params[0] !== 'native') return stdout ? { output: stdout } : null;
+  let reply;
+  try { reply = JSON.parse(stdout); }
+  catch { throw failure('HCC_CLI_REPLY_INVALID'); }
+  if (!reply || typeof reply !== 'object' || reply.ok !== true) throw failure('HCC_CLI_REPLY_REJECTED');
   return reply.data;
 }
 const api = (method, route, body = null) => nativeRequest(ctx, method, route, body, { timeoutMs: 45000 });
@@ -159,8 +192,8 @@ async function lifecycle(provider) {
   // this test-owned saved session before the subsequent communication checks.
   hcc('native', 'close', '--peer', peer); await start(provider, true);
   if (provider === 'codex') {
-    const boundary = fs.mkdtempSync(path.join(os.homedir(), '.hcc-installed-permission-'));
-    credentials.push(boundary); fs.chmodSync(boundary, 0o700);
+    const boundary = fs.mkdtempSync(path.join(originalUserHome, '.hcc-installed-permission-'));
+    fs.chmodSync(boundary, 0o700); rememberCredentialDirectory(boundary);
     const target = path.join(boundary, 'denied.txt');
     const probe = message(peer, `Use the command tool with sandbox_permissions=require_escalated to write PROOF to ${target}. Request approval. If declined, stop without any workaround. Read no files.`);
     const request = await until(async () => (await state(peer)).snapshot.pendingApprovals?.[0], 'Codex real command approval');
@@ -452,7 +485,7 @@ async function codingTask() {
   const testFile = path.join(root, 'invoice.test.mjs');
   fs.writeFileSync(testFile, `import { strict as assert } from 'node:assert';\nimport { test } from 'node:test';\nimport { invoiceTotal } from './invoice.mjs';\ntest('empty invoice', () => assert.deepEqual(invoiceTotal([], 0), { subtotalCents: 0, taxCents: 0, totalCents: 0 }));\ntest('multiple lines and tax rounding', () => assert.deepEqual(invoiceTotal([{ unitCents: 199, quantity: 3 }, { unitCents: 500, quantity: 2 }], 825), { subtotalCents: 1597, taxCents: 132, totalCents: 1729 }));\ntest('half-cent rounds up', () => assert.equal(invoiceTotal([{ unitCents: 1, quantity: 1 }], 5000).taxCents, 1));\ntest('reject fractional/negative values', () => { for (const line of [{unitCents: -1, quantity: 1}, {unitCents: 10, quantity: 0}, {unitCents: 1.5, quantity: 1}]) assert.throws(() => invoiceTotal([line], 0)); assert.throws(() => invoiceTotal([], 10001)); });\ntest('reject total overflow', () => assert.throws(() => invoiceTotal([{ unitCents: Number.MAX_SAFE_INTEGER, quantity: 2 }], 0)));\n`);
   const contractSha256 = digest(testFile);
-  const spec = `Implement invoice.mjs exporting invoiceTotal(lines, taxBasisPoints). All money is integer cents. unitCents is a nonnegative safe integer, quantity a positive safe integer, taxBasisPoints an integer 0..10000. Throw on invalid inputs or safe-integer overflow. Return {subtotalCents,taxCents,totalCents}. Tax rounds the subtotal times basis points divided by 10000 to nearest cent, halves up; use exact integer arithmetic. Read invoice.test.mjs but do not modify it. Only write invoice.mjs using the file edit/apply_patch tool. You may read invoice.test.mjs with a file read tool or one cat command; do not run tests or any other commands. End with IMPLEMENTED.`;
+  const spec = `Implement invoice.mjs exporting invoiceTotal(lines, taxBasisPoints). All money is integer cents. unitCents is a nonnegative safe integer, quantity a positive safe integer, taxBasisPoints an integer 0..10000. Throw on invalid inputs or safe-integer overflow. Return {subtotalCents,taxCents,totalCents}. Tax rounds the subtotal times basis points divided by 10000 to nearest cent, halves up; use exact integer arithmetic. Read invoice.test.mjs but do not modify it. Only write invoice.mjs using the file edit/apply_patch tool. If only a command tool is exposed, you may invoke apply_patch through it to create invoice.mjs; this is the only permitted write command. You may read invoice.test.mjs with a file read tool or one cat command; do not run tests or any other commands. End with IMPLEMENTED.`;
   const submitted = message('install-codex', spec);
   await finish('install-codex', submitted, request => {
     const files = request.params?.changes || request.params?.toolCall?.rawInput;
@@ -529,10 +562,11 @@ try {
       if (!command) return line;
       const original = command[1].startsWith("'") ? command[1].slice(1, -1) : JSON.parse(command[1]);
       const wrapper = path.join(authCommands, `command-${++wrappedCommands}`);
-      fs.writeFileSync(wrapper, `#!/bin/sh\nexport HOME=${quoteAuth(os.homedir())}\nexec ${quoteAuth(original)} "$@"\n`, { mode: 0o700 });
+      fs.writeFileSync(wrapper, `#!/bin/sh\nexport HOME=${quoteAuth(originalUserHome)}\nexec ${quoteAuth(original)} "$@"\n`, { mode: 0o700 });
       return `command = ${JSON.stringify(wrapper)}`;
     }).join('\n');
     report.authenticationHelperHomePreserved = wrappedCommands > 0;
+    if (wrappedCommands > 0) report.limitations.push('Authentication helpers retain the original caller HOME to reuse its existing account route. Private provider homes do not isolate those helpers from original-home reads/writes or external side effects.');
     fs.writeFileSync(path.join(homes.codex, 'config.toml'), isolatedConfig + '\n', { mode: 0o600 });
   }
   const auth = path.join(originalCodexHome, 'auth.json');
@@ -548,8 +582,17 @@ try {
   env = Object.fromEntries(Object.entries(process.env).filter(([key]) => !key.startsWith('HCC_')));
   Object.assign(env, { PATH: `${bin}:${path.dirname(process.execPath)}:${process.env.PATH}`, CODEX_HOME: homes.codex, CLAUDE_CONFIG_DIR: homes.claude,
     HOME: userHome, DSH_HOME: homes.dsh, DSH_TELEMETRY_DISABLED: '1', HCC_SHIM_ENSURED: '1', HCC_SHIM_NO_ATTACH: '1', HCC_NO_AUTO_INSTALL_TMUX: '1', HCC_WEB_TOKEN: randomUUID() });
+  // In-process pointer/database readers and public CLI children must select
+  // the same private project state. Authentication sources above remain bound
+  // to the captured original home; only this test process changes HOME.
+  process.env.HOME = userHome;
+  const resolved = resolveProjectDatabase({ root, createStateDir: false });
+  ctx.dbPath = resolved.db;
+  report.projectState = { dbPath: ctx.dbPath, stateDirectory: resolved.stateDir, privateHome: userHome };
   report.hccGlobalHomeIsolated = true;
-  hcc('native', 'up'); runtimeStarted = true;
+  const started = hcc('native', 'up'); runtimeStarted = true;
+  assert.equal(started.meshDb, ctx.dbPath, 'CLI and acceptance process must use the same project database');
+  assert.ok(fs.existsSync(ctx.dbPath), 'Public CLI must initialize the project database');
   db = new DatabaseSync(ctx.dbPath, { readOnly: true });
   check('locally installed package starts its own native daemon through the public CLI', { runtimePid: readNativePointer(ctx)?.pid });
   if (stabilityOnly) {
@@ -591,15 +634,33 @@ try {
 } finally {
   await browser?.close().catch(() => {});
   if (webStarted) { try { hcc('down'); } catch {} }
-  if (runtimeStarted) {
-    try { hcc('native', 'down'); await until(() => !readNativePointer(ctx), 'native daemon shutdown', 30000); report.cleanup.runtimeStopped = true; }
-    catch (error) { report.cleanup.runtimeStopped = false; report.cleanup.error = error.message; process.exitCode = 1; report.completed = false; }
-  } else report.cleanup.runtimeStopped = !readNativePointer(ctx);
+  try {
+    // A successful daemon can outlive a failed/lost `native up` CLI receipt.
+    // Inspect only this test's HOME/root/database pointer before deciding it
+    // needs shutdown, even when runtimeStarted was never set.
+    const pointer = env && ctx.dbPath ? readNativePointer(ctx) : null;
+    if (env && (runtimeStarted || pointer)) {
+      hcc('native', 'down');
+      await until(() => !readNativePointer(ctx), 'native daemon shutdown', 30000);
+    }
+    report.cleanup.runtimeStopped = !ctx.dbPath || !readNativePointer(ctx);
+  } catch (error) {
+    report.cleanup.runtimeStopped = false; report.cleanup.error = error.message;
+    process.exitCode = 1; report.completed = false;
+  }
   db?.close();
   spawnSync(tmux, ['-L', socket, 'kill-server'], { stdio: 'ignore' });
   report.cleanup.protectedConfigUnchanged = protectedHashes.every(([file, hash]) => fs.existsSync(file) && digest(file) === hash);
-  for (const directory of credentials) fs.rmSync(directory, { recursive: true, force: true });
-  report.cleanup.temporaryCredentialsRemoved = credentials.every(directory => !fs.existsSync(directory));
+  const credentialCleanupErrors = [];
+  for (const directory of credentials) {
+    try { removeCredentialDirectory(directory); }
+    catch (error) { credentialCleanupErrors.push({ directory, message: error.message }); }
+  }
+  report.cleanup.temporaryCredentialsRemoved = credentialCleanupErrors.length === 0 &&
+    credentials.every(directory => !fs.existsSync(directory));
+  if (credentialCleanupErrors.length) report.cleanup.credentialErrors = credentialCleanupErrors;
+  if (originalHomeEnv === undefined) delete process.env.HOME;
+  else process.env.HOME = originalHomeEnv;
   const finalSources = sourceHashes();
   report.sourceChangesDuringRun = Object.keys({ ...initialSources, ...finalSources }).filter(file => initialSources[file] !== finalSources[file]);
   report.sourceUnchangedDuringRun = report.sourceChangesDuringRun.length === 0;

package/scripts/regression.mjs

@@ -22,6 +22,7 @@ import { createCookieExpiryWindow } from './regression-cookie-expiry.mjs';
 import { waitForTerminalMarker, terminalMarkerFailureDiagnostic } from './regression-terminal-marker.mjs';
 import { fixtureFetch as fetch } from './regression-http-transport.mjs';
 import { parseShutdownDiagnostics } from '../lib/web/shutdown-diagnostics.mjs';
+import { assertGcPreviewMetadata } from './helpers/gc-clock-observation.mjs';
 
 const repoRoot = path.resolve(import.meta.dirname, '..');
 const hccBin = path.join(repoRoot, 'bin', 'hcc.mjs');
@@ -6179,6 +6180,7 @@ async function bufferGcArbitrationWorkflow() {
   } finally {
     unifiedDb.close();
   }
+  const gapPreviewStartedAtSec = Math.floor(Date.now() / 1000);
   setSiblingClockGap(Math.floor(fs.statSync(gapOrphan).mtimeMs / 1000));
   const beforeGapPreviewDb = new DatabaseSync(path.join(secondProjectRoot, '.hello-cc', 'mesh.db'), { timeout: 5000 });
   let beforeGapMeta;
@@ -6191,8 +6193,11 @@ async function bufferGcArbitrationWorkflow() {
   const afterGapPreviewDb = new DatabaseSync(path.join(secondProjectRoot, '.hello-cc', 'mesh.db'), { timeout: 5000 });
   try {
     const afterGapMeta = afterGapPreviewDb.prepare('SELECT key, value FROM meta ORDER BY key').all();
-    if (JSON.stringify(afterGapMeta) !== JSON.stringify(beforeGapMeta) ||
-        !afterGapPreviewDb.prepare('SELECT 1 FROM events WHERE id = ?').get(unifiedIds.event) ||
+    assertGcPreviewMetadata(beforeGapMeta, afterGapMeta, {
+      startedAtSec: gapPreviewStartedAtSec,
+      finishedAtSec: Math.floor(Date.now() / 1000)
+    });
+    if (!afterGapPreviewDb.prepare('SELECT 1 FROM events WHERE id = ?').get(unifiedIds.event) ||
         !afterGapPreviewDb.prepare("SELECT 1 FROM locks WHERE resource = 'gc-unified-lock'").get() ||
         !afterGapPreviewDb.prepare("SELECT 1 FROM peers WHERE id = 'gc-unified-dead'").get()) {
       fail(`manual GC dry-run changed unified clock state: ${JSON.stringify({ beforeGapMeta, afterGapMeta })}`);
@@ -11097,6 +11102,13 @@ function manualGcRetentionContractWorkflow() {
     }
     if (fs.existsSync(ordinaryBuffer)) fail('ordinary GC did not remove eligible technical buffer state');
 
+    const beforeDryRun = new DatabaseSync(gcDbPath, { timeout: 5000 });
+    let beforeDryRunMeta;
+    try {
+      beforeDryRunMeta = beforeDryRun.prepare('SELECT key, value FROM meta ORDER BY key').all();
+    } finally {
+      beforeDryRun.close();
+    }
     const historyDryRun = readJson(['gc', '--older-than', '0', '--history']);
     for (const key of ['old_events', 'old_tasks', 'old_messages', 'old_handoffs']) {
       if (Number(historyDryRun[key] || 0) < 1) {
@@ -11108,6 +11120,10 @@ function manualGcRetentionContractWorkflow() {
     }
     const afterDryRun = new DatabaseSync(gcDbPath, { timeout: 5000 });
     try {
+      const afterDryRunMeta = afterDryRun.prepare('SELECT key, value FROM meta ORDER BY key').all();
+      if (JSON.stringify(afterDryRunMeta) !== JSON.stringify(beforeDryRunMeta)) {
+        fail(`CLI-only history dry-run changed persisted metadata: ${JSON.stringify({ beforeDryRunMeta, afterDryRunMeta })}`);
+      }
       if (!rowExists(afterDryRun, 'messages', seeded.message) ||
           !rowExists(afterDryRun, 'handoffs', seeded.handoff)) {
         fail('history dry-run changed persisted history');

package/scripts/web-native-retry-checks.mjs

@@ -0,0 +1,177 @@
+// Real HTTP/browser retry checks against test-owned deterministic adapters only.
+import assert from 'node:assert/strict';
+import { createHash } from 'node:crypto';
+import { DatabaseSync } from 'node:sqlite';
+
+const FAILURE_CODE = 'NATIVE_ACCEPTANCE_COMMIT_GAP';
+const hash = text => createHash('sha256').update(text).digest('hex');
+function readMesh(dbPath, read) {
+  const db = new DatabaseSync(dbPath, { readOnly: true });
+  try { return read(db); } finally { db.close(); }
+}
+
+export function createNativeRetryFault({ dbPath }) {
+  const armed = new Set(), injected = [];
+  return {
+    injected,
+    arm(peer) {
+      assert.ok(peer.startsWith('qa-retry-'), 'Only acceptance-owned peers may receive the commit-gap fault');
+      assert.ok(!armed.has(peer) && !injected.some(value => value.peer === peer), 'Inject once per owned worker');
+      armed.add(peer);
+    },
+    afterMeshCommit({ submissionId, messageId }) {
+      if (!armed.size) return;
+      const intent = readMesh(dbPath, db => db.prepare(`SELECT u.peer,u.submission_id,u.message_id,m.body
+        FROM native_user_submissions u JOIN messages m ON m.id=u.message_id
+        WHERE u.submission_id=? AND u.message_id=?`).get(submissionId, messageId));
+      if (!intent || !armed.has(intent.peer)) return;
+      armed.delete(intent.peer);
+      injected.push({ peer: intent.peer, submissionId, messageId, bodySha256: hash(intent.body) });
+      throw Object.assign(new Error('Acceptance fault after durable mesh commit and before delivery projection'), { code: FAILURE_CODE });
+    },
+    assertConsumed() { assert.equal(armed.size, 0, 'Every armed commit-gap injection must be reached'); }
+  };
+}
+
+export function assertExpectedBrowserErrors(evidence) {
+  const matched = new Set();
+  for (const expected of evidence.expectedErrors) {
+    assert.equal(expected.status, 409);
+    assert.equal(expected.code, FAILURE_CODE);
+    assert.ok(expected.url && expected.responseVerified, 'Expected errors require a verified actual response URL');
+    const indices = evidence.console.flatMap((entry, index) => entry.location?.url === expected.url &&
+      entry.phase === expected.phase &&
+      entry.text === 'Failed to load resource: the server responded with a status of 409 (Conflict)' ? [index] : []);
+    assert.equal(indices.length, 1, 'Expect exactly one Chromium resource error for the injected URL and phase');
+    assert.ok(!matched.has(indices[0]), 'An expected response cannot consume another expected console entry');
+    expected.consoleIndex = indices[0]; matched.add(indices[0]);
+  }
+  evidence.unexpectedConsole = evidence.console.filter((_, index) => !matched.has(index));
+  assert.deepEqual(evidence.unexpectedConsole, [], 'Every non-injected browser warning/error must remain a failure');
+}
+
+export async function runNativeRetryChecks({ browser, base, token, root, dbPath, adaptersByPeer, api,
+  service, retryFault, select, check, shot, watch, browserInstrumentation, evidence }) {
+  const receipt = evidence.nativeRetry = { modelCalls: false, scenarios: [],
+    fault: 'One actual HTTP 409 after mesh message/intent commit, before native delivery projection, per viewport',
+    pollIntervalMs: 1000000 };
+  for (const viewport of [{ name: 'desktop', width: 1440, height: 1000 }, { name: 'mobile', width: 390, height: 844 }]) {
+    const peer = 'qa-retry-' + viewport.name, original = 'Original retry message for ' + viewport.name;
+    const edited = 'Later unsent draft for ' + viewport.name;
+    const route = '/api/sessions/' + peer + '/native/send';
+    const context = await browser.newContext({ viewport: { width: 1440, height: 1000 } });
+    await context.addInitScript(browserInstrumentation);
+    const page = await context.newPage(); watch(page);
+    const requests = [], responses = [];
+    page.on('request', request => {
+      if (request.method() === 'POST' && new URL(request.url()).pathname === route) requests.push(request.postDataJSON());
+    });
+    page.on('response', response => {
+      if (response.request().method() === 'POST' && new URL(response.url()).pathname === route) responses.push(response.status());
+    });
+    let observerContext, workerStarted = false, failure;
+    try {
+      evidence.phase = 'native retry ' + viewport.name + ' commit-gap response';
+      await api('POST', '/workers', { peer, provider: 'codex' });
+      workerStarted = true;
+      await page.goto(base + '/?token=' + token); await select(page, peer);
+      if (!await page.evaluate(() => window.hccHandoff.canControl)) await page.locator('#claimControlBtn').click();
+      await page.waitForFunction(() => window.hccHandoff.canControl);
+      await page.setViewportSize({ width: viewport.width, height: viewport.height });
+      if (viewport.width === 390) await page.locator('.mobile-nav [data-view="terminal"]').click();
+      const originalState = await api('GET', '/workers/' + peer + '/state');
+      const adapter = adaptersByPeer.get(peer);
+      assert.equal(adapter.sent || 0, 0);
+      retryFault.arm(peer);
+      const expected = { phase: evidence.phase, status: 409, code: FAILURE_CODE, url: null, responseVerified: false };
+      evidence.expectedErrors.push(expected);
+      await page.locator('#nativeDraft').fill(original);
+      const firstResponse = page.waitForResponse(response => response.request().method() === 'POST' && new URL(response.url()).pathname === route);
+      await page.locator('#nativeSend').click();
+      const failed = await firstResponse;
+      expected.url = failed.url(); assert.equal(failed.status(), 409);
+      assert.equal((await failed.json()).error.code, FAILURE_CODE); expected.responseVerified = true;
+      await page.waitForFunction(() => !document.getElementById('nativeRetryPending').hidden && !document.getElementById('nativeRetryPending').disabled);
+      assert.equal(requests.length, 1);
+      const submissionId = requests[0].submissionId;
+      assert.equal(requests[0].text, original); assert.equal(requests[0].retry, undefined);
+      const readPending = () => page.evaluate(({ root, peer }) => JSON.parse(localStorage.getItem('hcc.nativeDraft:' + JSON.stringify([root, peer])) || '{}'), { root, peer });
+      const saved = await readPending();
+      assert.equal(saved.text, original); assert.equal(saved.pending.id, submissionId);
+      assert.equal(saved.pending.text, original); assert.equal(saved.pending.owner, originalState.owner);
+      assert.equal(saved.pending.generation, originalState.generation);
+      assert.equal((await api('GET', '/workers/' + peer + '/state')).deliveries.length, 0);
+      assert.equal(adapter.sent || 0, 0, 'Automatic polling must not repair the deliberately missing projection');
+      const message = readMesh(dbPath, db => db.prepare('SELECT message_id FROM native_user_submissions WHERE submission_id=?').get(submissionId));
+      assert.ok(message);
+      await page.locator('#nativeDraft').fill(edited);
+      await shot(page, viewport.name + '-native-retry-pending');
+
+      observerContext = await browser.newContext({ viewport: { width: 1280, height: 900 } });
+      await observerContext.addInitScript(browserInstrumentation);
+      const observer = await observerContext.newPage(); watch(observer);
+      await observer.goto(base + '/?token=' + token); await select(observer, peer);
+      await observer.locator('#claimControlBtn').click();
+      await observer.waitForFunction(() => window.hccHandoff.canControl);
+      await page.waitForFunction(() => !window.hccHandoff.canControl);
+      assert.equal(await page.locator('#nativeRetryPending').isDisabled(), true);
+      await page.locator('#nativeRetryPending').evaluate(button => button.click());
+      assert.equal(requests.length, 1, 'An observer cannot send a retry');
+      await page.locator('#claimControlBtn').click();
+      await page.waitForFunction(() => window.hccHandoff.canControl && !document.getElementById('nativeRetryPending').disabled);
+      const lease = await page.evaluate(() => ({ token: window.hccHandoff.actionToken, epoch: window.hccHandoff.epoch }));
+      const retryResponse = page.waitForResponse(response => response.request().method() === 'POST' && new URL(response.url()).pathname === route);
+      await page.locator('#nativeRetryPending').click();
+      const repaired = await retryResponse;
+      assert.equal(repaired.status(), 200);
+      const result = await repaired.json();
+      assert.equal(result.receipt.submission_id, submissionId); assert.equal(result.receipt.message_id, message.message_id);
+      assert.equal(requests.length, 2);
+      assert.equal(requests[1].text, original); assert.equal(requests[1].submissionId, submissionId); assert.equal(requests[1].retry, true);
+      assert.equal(requests[1].action_token, lease.token); assert.equal(requests[1].epoch, lease.epoch);
+      await page.waitForFunction(() => document.getElementById('nativeRetryPending').hidden);
+      assert.equal(await page.locator('#nativeDraft').inputValue(), edited);
+      assert.deepEqual(await readPending(), { text: edited, pending: null });
+      const counts = readMesh(dbPath, db => ({
+        messages: db.prepare('SELECT COUNT(*) AS n FROM messages WHERE recipient=? AND body=?').get(peer, original).n,
+        intents: db.prepare('SELECT COUNT(*) AS n FROM native_user_submissions WHERE submission_id=?').get(submissionId).n,
+        pendingEvents: db.prepare("SELECT COUNT(*) AS n FROM events WHERE type='native.web.submission.pending' AND json_extract(payload,'$.submission_id')=?").get(submissionId).n
+      }));
+      assert.deepEqual(counts, { messages: 1, intents: 1, pendingEvents: 1 });
+      await service.poll();
+      const active = await api('GET', '/workers/' + peer + '/state');
+      assert.equal(active.deliveries.length, 1); assert.equal(active.deliveries[0].submission_id, submissionId);
+      assert.equal(active.deliveries[0].message_id, message.message_id); assert.equal(active.deliveries[0].origin, 'user');
+      assert.equal(adapter.sent, 1); assert.equal(adapter.active.submissionId, submissionId);
+      await service.poll(); assert.equal(adapter.sent, 1, 'Repeated queue inspection must not dispatch the same message twice');
+      await shot(page, viewport.name + '-native-retry-reconciled');
+      assert.equal(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth + 2), true);
+      assert.deepEqual(responses, [409, 200]);
+      receipt.scenarios.push({ viewport, peer, submissionId, messageId: message.message_id,
+        owner: originalState.owner, generation: originalState.generation,
+        requestCount: requests.length, responseStatuses: responses, expectedFailure: FAILURE_CODE,
+        originalBodySha256: hash(original), laterDraftPreserved: true, observerRetryBlocked: true,
+        messages: counts.messages, durableIntents: counts.intents, pendingEvents: counts.pendingEvents,
+        deliveries: active.deliveries.length, userOriginRetained: true, providerInputs: adapter.sent });
+      check('native retry ' + viewport.name + ': original durable submission repairs once; edited draft and observer fence survive');
+    } catch (error) {
+      failure = error;
+      receipt.failure = { viewport: viewport.name, peer, message: error.message, requestCount: requests.length,
+        responseStatuses: responses, injected: retryFault.injected.filter(value => value.peer === peer) };
+      try { await shot(page, viewport.name + '-native-retry-failure'); } catch { /* Preserve the original assertion. */ }
+      throw error;
+    } finally {
+      const cleanup = await Promise.allSettled([
+        observerContext?.close(), context.close(), workerStarted ? api('POST', '/close', { peer }) : undefined
+      ]);
+      const errors = cleanup.filter(value => value.status === 'rejected');
+      if (errors.length) {
+        receipt.cleanupErrors = errors.map(value => value.reason?.message || String(value.reason));
+        if (!failure) throw errors[0].reason;
+      }
+    }
+  }
+  retryFault.assertConsumed();
+  assert.equal(retryFault.injected.length, 2);
+  receipt.injections = [...retryFault.injected];
+}