@logicseek/hello-cc 0.1.8 → 1.0.0

package/lib/db/schema.mjs

@@ -1,6 +1,7 @@
+import { aggregateCleanupFailure } from '../shared/cleanup-error.mjs';
 import { CliError } from '../shared/errors.mjs';
 
-export const DB_SCHEMA_VERSION = 5;
+export const DB_SCHEMA_VERSION = 7;
 
 const sleepBuffer = new SharedArrayBuffer(4);
 const sleepView = new Int32Array(sleepBuffer);
@@ -21,6 +22,18 @@ function isSqliteBusy(err) {
     /SQLITE_BUSY|SQLITE_LOCKED|database is locked|database is busy/i.test(text);
 }
 
+function failedRollbackMetadata(db, context) {
+  let transactionActive = null;
+  try {
+    transactionActive = Boolean(db.isTransaction);
+  } catch {}
+  return {
+    context,
+    transactionActive,
+    connectionUsable: false
+  };
+}
+
 export function execWithBusyRetry(db, sql, { attempts = 30, delayMs = 100, ignoreBusy = false } = {}) {
   for (let attempt = 0; attempt < attempts; attempt += 1) {
     try {
@@ -47,14 +60,49 @@ export function tx(db, fn) {
   } catch (err) {
     try {
       db.exec('ROLLBACK;');
-    } catch {
-      // Ignore rollback failures; the original error is more useful.
+    } catch (cleanupError) {
+      throw aggregateCleanupFailure(
+        err,
+        cleanupError,
+        'Write transaction failed and rollback also failed',
+        failedRollbackMetadata(db, 'Write transaction rollback')
+      );
     }
     throw err;
   }
 }
 
-export function initSchema(db, { beforePostMigrationIndexes = null } = {}) {
+// Deferred read transaction: gives a consistent snapshot for multi-table reads
+// without taking a write lock (unlike tx's BEGIN IMMEDIATE). Use for read-only
+// snapshot assembly so peers/tasks/locks counts cannot drift mid-read (conc-06).
+export function readTx(db, fn, options = {}) {
+  db.exec('BEGIN;');
+  try {
+    const result = fn();
+    db.exec('COMMIT;');
+    return result;
+  } catch (err) {
+    try {
+      db.exec('ROLLBACK;');
+    } catch (cleanupError) {
+      throw aggregateCleanupFailure(
+        err,
+        cleanupError,
+        `${options.cleanupContext || 'Read transaction'} failed and rollback also failed`,
+        failedRollbackMetadata(
+          db,
+          `${options.cleanupContext || 'Read transaction'} rollback`
+        )
+      );
+    }
+    throw err;
+  }
+}
+
+export function initSchema(db, {
+  beforeMigration = null,
+  beforePostMigrationIndexes = null
+} = {}) {
   const existingVersion = readSchemaVersion(db);
   if (existingVersion > DB_SCHEMA_VERSION) {
     throw new CliError('DB_SCHEMA_TOO_NEW', `Database schema version ${existingVersion} is newer than this hcc (${DB_SCHEMA_VERSION})`, {
@@ -62,6 +110,17 @@ export function initSchema(db, { beforePostMigrationIndexes = null } = {}) {
       supported_schema_version: DB_SCHEMA_VERSION
     });
   }
+  const hasExistingSchema = Boolean(db.prepare(`
+    SELECT 1
+    FROM sqlite_master
+    WHERE type = 'table' AND name NOT LIKE 'sqlite_%'
+    LIMIT 1
+  `).get());
+  if (existingVersion < DB_SCHEMA_VERSION &&
+      (existingVersion > 0 || hasExistingSchema) &&
+      typeof beforeMigration === 'function') {
+    beforeMigration({ fromVersion: existingVersion, toVersion: DB_SCHEMA_VERSION });
+  }
   createBaseSchema(db);
   runSchemaMigrations(db);
   if (typeof beforePostMigrationIndexes === 'function') beforePostMigrationIndexes(db);
@@ -88,6 +147,8 @@ function createBaseSchema(db) {
       worktree TEXT,
       branch TEXT,
       pid INTEGER,
+      pid_start_token TEXT,
+      pid_command_hash TEXT,
       status TEXT NOT NULL DEFAULT 'idle',
       capabilities TEXT,
       created_at INTEGER NOT NULL,
@@ -155,7 +216,8 @@ function createBaseSchema(db) {
       task_id INTEGER,
       reason TEXT,
       expires_at INTEGER NOT NULL,
-      created_at INTEGER NOT NULL
+      created_at INTEGER NOT NULL,
+      ttl_sec INTEGER NOT NULL DEFAULT 900
     );
 
     CREATE TABLE IF NOT EXISTS handoffs (
@@ -294,6 +356,35 @@ function runSchemaMigrations(db) {
           CREATE INDEX IF NOT EXISTS idx_locks_base_scope ON locks(base_resource, scope);
         `);
       }
+    },
+    {
+      version: 6,
+      name: 'persist lock ttl',
+      up(database) {
+        const hadTtlColumn = tableColumns(database, 'locks').has('ttl_sec');
+        addColumnIfMissing(database, 'locks', 'ttl_sec', 'ttl_sec INTEGER NOT NULL DEFAULT 900');
+        database.exec(hadTtlColumn
+          ? `
+              UPDATE locks
+              SET ttl_sec = 900
+              WHERE ttl_sec IS NULL OR ttl_sec <= 0;
+            `
+          : `
+              UPDATE locks
+              SET ttl_sec = CASE
+                WHEN expires_at > created_at THEN MIN(expires_at - created_at, 3600)
+                ELSE 900
+              END;
+            `);
+      }
+    },
+    {
+      version: 7,
+      name: 'peer process identity fingerprints',
+      up(database) {
+        addColumnIfMissing(database, 'peers', 'pid_start_token', 'pid_start_token TEXT');
+        addColumnIfMissing(database, 'peers', 'pid_command_hash', 'pid_command_hash TEXT');
+      }
     }
   ];
   let version = readSchemaVersion(db);
@@ -304,6 +395,12 @@ function runSchemaMigrations(db) {
     });
   }
   const applied = new Set(db.prepare('SELECT version FROM schema_migrations').all().map((row) => Number(row.version)));
+  // Already fully migrated: skip the write transaction entirely. Read-only
+  // commands (hcc status/peers/task list) then open the DB without taking a
+  // RESERVED write lock or appending WAL frames on every connect (conc-01).
+  if (version === DB_SCHEMA_VERSION && migrations.every((m) => applied.has(m.version))) {
+    return;
+  }
   tx(db, () => {
     for (const migration of migrations) {
       if (version >= migration.version && applied.has(migration.version)) continue;

package/lib/db/stores/peers.mjs

@@ -7,6 +7,7 @@ import {
   mergePeerBinding,
   mergeRuntimeBinding
 } from '../../core/peers/bindings.mjs';
+import { providerSessionPeerId } from '../../core/peers/session.mjs';
 
 function defaultNow() {
   return Math.floor(Date.now() / 1000);
@@ -14,6 +15,23 @@ function defaultNow() {
 
 function noopEvent() {}
 
+function crossesV1ProviderIdentityBoundary(binding, conflict) {
+  const providerSession = bindingProviderSessionValue(binding);
+  if (!providerSession || !binding?.provider) return false;
+  const v1Peer = providerSessionPeerId(binding.provider, providerSession);
+  return binding.peer === v1Peer && conflict?.peer !== v1Peer;
+}
+
+function withoutProviderSession(binding) {
+  return {
+    ...binding,
+    provider_session_id: null,
+    provider_session_name: null,
+    resume_mode: 'unknown',
+    resume_arg: null
+  };
+}
+
 export function createPeerBindingStore(deps = {}) {
   const now = typeof deps.now === 'function' ? deps.now : defaultNow;
   const addEvent = typeof deps.addEvent === 'function' ? deps.addEvent : noopEvent;
@@ -125,6 +143,22 @@ export function createPeerBindingStore(deps = {}) {
     const conflictRuntime = bindingHasRuntime(conflict);
     const providerSession = bindingProviderSessionValue(next);
     const override = Boolean(options.override);
+    const preV1Conflict = crossesV1ProviderIdentityBoundary(next, conflict);
+    const passiveObservation = !incomingRuntime || next.resume_mode === 'detected';
+
+    if (preV1Conflict && passiveObservation) {
+      next = withoutProviderSession(next);
+      return { peer: next.peer, binding: next, merged_from: null };
+    }
+
+    if (preV1Conflict && incomingRuntime && !override) {
+      throw new CliError('PROVIDER_SESSION_IN_USE', `${next.provider} session ${providerSession} is already bound to ${conflict.peer}`, {
+        peer: conflict.peer,
+        provider: conflict.provider,
+        provider_session: providerSession,
+        runtime_target: conflict.runtime_target || null
+      });
+    }
 
     if (override && incomingRuntime) {
       db.prepare('DELETE FROM peer_bindings WHERE peer = ?').run(conflict.peer);

package/lib/integrations/peers/identity.mjs

@@ -84,28 +84,74 @@ function detectCliKindFromProcess(args, env) {
   return null;
 }
 
-export function readAncestorCliInfo() {
-  if (ancestorCliInfoCache !== undefined) return ancestorCliInfoCache;
-  if (process.platform !== 'linux') {
-    ancestorCliInfoCache = null;
-    return ancestorCliInfoCache;
+export function findLinuxAncestorCliInfo(startPid, options = {}) {
+  const read = typeof options.read === 'function'
+    ? options.read
+    : (pid) => ({
+        args: readProcCmdline(pid),
+        env: readProcEnv(pid),
+        parent: readProcParentPid(pid)
+      });
+  let pid = Number(startPid);
+  const seen = new Set();
+  for (let depth = 0; Number.isInteger(pid) && pid > 1 && depth < 12 && !seen.has(pid); depth += 1) {
+    seen.add(pid);
+    const row = read(pid);
+    if (!row) return null;
+    const args = Array.isArray(row.args) ? row.args : [];
+    const env = row.env && typeof row.env === 'object' && !Array.isArray(row.env) ? row.env : {};
+    const kind = detectCliKindFromProcess(args, env);
+    if (kind) return { pid, kind, args, env };
+    pid = Number(row.parent);
   }
+  return null;
+}
 
-  let pid = process.ppid;
+export function parseMacAncestorLine(text) {
+  const line = String(text ?? '').trimEnd();
+  if (!line || line.includes('\n') || line.includes('\r')) return null;
+  const match = line.match(/^\s*([0-9]+)\s+(.+?)\s*$/);
+  if (!match) return null;
+  const ppid = Number(match[1]);
+  const command = match[2];
+  if (!Number.isSafeInteger(ppid) || ppid < 0 || !command) return null;
+  return { ppid, command };
+}
+
+function inspectMacAncestor(pid) {
+  const result = spawnSync('ps', ['-ww', '-o', 'ppid=', '-o', 'command=', '-p', String(pid)], {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+    env: { ...process.env, LC_ALL: 'C', LANG: 'C' }
+  });
+  if (result.error || result.status !== 0) return null;
+  return result.stdout || '';
+}
+
+export function findMacAncestorCliInfo(startPid, options = {}) {
+  const inspect = typeof options.inspect === 'function' ? options.inspect : inspectMacAncestor;
+  let pid = Number(startPid);
   const seen = new Set();
-  for (let depth = 0; pid && pid > 1 && depth < 12 && !seen.has(pid); depth += 1) {
+  for (let depth = 0; Number.isInteger(pid) && pid > 1 && depth < 12 && !seen.has(pid); depth += 1) {
     seen.add(pid);
-    const args = readProcCmdline(pid);
-    const env = readProcEnv(pid);
-    const kind = detectCliKindFromProcess(args, env);
-    if (kind) {
-      ancestorCliInfoCache = { pid, kind, args, env };
-      return ancestorCliInfoCache;
-    }
-    pid = readProcParentPid(pid);
+    const parsed = parseMacAncestorLine(inspect(pid));
+    if (!parsed) return null;
+    const kind = detectCliKindFromProcess([parsed.command], {});
+    // `ps command` is sufficient for provider-kind detection but is not a
+    // lossless argv encoding. Do not feed it to resume-ID parsing.
+    if (kind) return { pid, kind, args: [], env: {}, command: parsed.command };
+    pid = parsed.ppid;
   }
+  return null;
+}
 
-  ancestorCliInfoCache = null;
+export function readAncestorCliInfo() {
+  if (ancestorCliInfoCache !== undefined) return ancestorCliInfoCache;
+  ancestorCliInfoCache = process.platform === 'linux'
+    ? findLinuxAncestorCliInfo(process.ppid)
+    : process.platform === 'darwin'
+      ? findMacAncestorCliInfo(process.ppid)
+      : null;
   return ancestorCliInfoCache;
 }
 

package/lib/integrations/shims/script.mjs

@@ -57,8 +57,59 @@ if [ -z "$HCC_ROOT" ]; then
   exec "$REAL_BIN" "$@"
 fi
 
-sanitize_peer_part() {
-  printf '%s' "$1" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9._-]/-/g; s/^-*//; s/-*$//' | cut -c 1-32
+# sess-04: sha1 hash of the FULL provider id/name, first 8 hex chars — must
+# match the JS shortHash() exactly (lib/core/peers/format.mjs). Name-based ids
+# that share a prefix used to collide into the same peer id.
+is_sha1_hex() {
+  [ "\${#1}" -eq 40 ] || return 1
+  case "$1" in
+    *[!0-9a-f]*) return 1 ;;
+  esac
+  return 0
+}
+
+peer_hash() {
+  local HASH=""
+  local OUTPUT=""
+
+  if command -v openssl >/dev/null 2>&1; then
+    OUTPUT=$(printf '%s' "$1" | openssl dgst -sha1 2>/dev/null || true)
+    HASH=$(printf '%s\n' "$OUTPUT" | awk 'NR == 1 { print $NF }' | tr '[:upper:]' '[:lower:]')
+    is_sha1_hex "$HASH" || HASH=""
+  fi
+
+  if [ -z "$HASH" ] && command -v sha1sum >/dev/null 2>&1; then
+    OUTPUT=$(printf '%s' "$1" | sha1sum 2>/dev/null || true)
+    HASH=$(printf '%s\n' "$OUTPUT" | awk 'NR == 1 { print $1 }' | tr '[:upper:]' '[:lower:]')
+    is_sha1_hex "$HASH" || HASH=""
+  fi
+
+  if [ -z "$HASH" ] && command -v shasum >/dev/null 2>&1; then
+    OUTPUT=$(printf '%s' "$1" | shasum 2>/dev/null || true)
+    HASH=$(printf '%s\n' "$OUTPUT" | awk 'NR == 1 { print $1 }' | tr '[:upper:]' '[:lower:]')
+    is_sha1_hex "$HASH" || HASH=""
+  fi
+
+  # A hello-cc environment always has node on PATH (hcc itself is a node CLI),
+  # so this fallback guarantees registration even on minimal systems without
+  # openssl/sha1sum/shasum. Digest must match the JS shortHash exactly.
+  if [ -z "$HASH" ] && command -v node >/dev/null 2>&1; then
+    HASH=$(printf '%s' "$1" | node -e 'let d="";process.stdin.on("data",c=>d+=c);process.stdin.on("end",()=>process.stdout.write(require("node:crypto").createHash("sha1").update(d).digest("hex")))' 2>/dev/null || true)
+    is_sha1_hex "$HASH" || HASH=""
+  fi
+
+  if ! is_sha1_hex "$HASH"; then
+    printf '%s\n' 'hello-cc: unable to derive peer id: no SHA-1 command produced a valid digest' >&2
+    return 1
+  fi
+
+  printf '%.8s' "$HASH"
+}
+
+provider_peer_id() {
+  local HASH_PART=""
+  HASH_PART=$(peer_hash "$1") || return 1
+  printf '%s-%s' '${tool.kind}' "$HASH_PART"
 }
 
 tty_peer_part() {
@@ -96,13 +147,13 @@ done
 if [ -n "$HCC_PEER" ]; then
   PEER_ID="$HCC_PEER"
 elif [ -n "$SESSION_ID" ]; then
-  PEER_ID="${tool.kind}-\$(sanitize_peer_part "\${SESSION_ID:0:8}")"
+  PEER_ID=$(provider_peer_id "$SESSION_ID") || exec "$REAL_BIN" "$@"
 elif [ -n "$RESUME_ID" ] && [ "$IS_FORK" != "1" ]; then
-  PEER_ID="${tool.kind}-\$(sanitize_peer_part "\${RESUME_ID:0:8}")"
+  PEER_ID=$(provider_peer_id "$RESUME_ID") || exec "$REAL_BIN" "$@"
 elif [ -n "$CLAUDE_CODE_SESSION_ID" ]; then
-  PEER_ID="${tool.kind}-\$(sanitize_peer_part "\${CLAUDE_CODE_SESSION_ID:0:8}")"
+  PEER_ID=$(provider_peer_id "$CLAUDE_CODE_SESSION_ID") || exec "$REAL_BIN" "$@"
 elif [ -n "$SESSION_NAME" ] && [ "$IS_FORK" != "1" ] && [ "$IS_CONTINUE" != "1" ]; then
-  PEER_ID="${tool.kind}-\$(sanitize_peer_part "$SESSION_NAME")"
+  PEER_ID=$(provider_peer_id "$SESSION_NAME") || exec "$REAL_BIN" "$@"
 else
   PEER_ID="${tool.kind}-\$(tty_peer_part)"
 fi
@@ -139,14 +190,22 @@ detect_current_hcc_pane() {
   return 1
 }
 
+hcc_runtime_unavailable_start_failure() {
+  case "$1" in
+    *"No running web runtime found"*|*"No running hello-cc web runtime found"*|*"Runtime is not reachable"*|*"RUNTIME_NOT_RUNNING"*|*"RUNTIME_UNREACHABLE"*|*"RUNTIME_START_FAILED"*|*"RUNTIME_START_TIMEOUT"*)
+      return 0
+      ;;
+  esac
+  return 1
+}
+
 if detect_current_hcc_pane; then
   SESSION_PEER_ID=$(printf '%s' "$CURRENT_HCC_SESSION" | sed 's/^hcc-[^-]*-//')
   if [ -n "$SESSION_PEER_ID" ] && [ "$SESSION_PEER_ID" != "$CURRENT_HCC_SESSION" ]; then
     PEER_ID="$SESSION_PEER_ID"
   fi
   export HCC_PEER="$PEER_ID"
-  HCC_SKIP_SHIM_INSTALL=1 "$HCC_BIN" web >/dev/null 2>&1 || true
-  "$HCC_BIN" peer attach "$PEER_ID" --kind "${tool.kind}" --pane "$CURRENT_HCC_PANE" --cwd "$PWD" --force >/dev/null 2>&1 || true
+  HCC_RUNTIME_LOCAL_ONLY=1 "$HCC_BIN" peer attach "$PEER_ID" --kind "${tool.kind}" --pane "$CURRENT_HCC_PANE" --cwd "$PWD" --force >/dev/null 2>&1 || true
   exec "$REAL_BIN" "$@"
 fi
 
@@ -155,12 +214,15 @@ HCC_PROVIDER_LAUNCH_SCRIPT='REAL_BIN="$1"; shift; HCC_TMUX_BIN="\${HCC_TMUX_BIN:
 set +e
 # Wrap in shell so pane_pid stays as bash; Ctrl+C drops back to bash
 START_OUT_FILE=$(mktemp "\${TMPDIR:-/tmp}/hcc-shim-start.XXXXXX")
-(HCC_SKIP_SHIM_INSTALL=1 "$HCC_BIN" web >/dev/null 2>&1 || true; "$HCC_BIN" peer start "$PEER_ID" --kind "${tool.kind}" --restart-env -- bash -lc "$HCC_PROVIDER_LAUNCH_SCRIPT" _ "$REAL_BIN" "$@") >"$START_OUT_FILE" 2>&1
+(HCC_RUNTIME_LOCAL_ONLY=1 "$HCC_BIN" peer start "$PEER_ID" --kind "${tool.kind}" --restart-env -- bash -lc "$HCC_PROVIDER_LAUNCH_SCRIPT" _ "$REAL_BIN" "$@") >"$START_OUT_FILE" 2>&1
 START_STATUS=$?
 START_OUT=$(cat "$START_OUT_FILE" 2>/dev/null || true)
 rm -f "$START_OUT_FILE"
 set -e
 if [ "$START_STATUS" -ne 0 ]; then
+  if hcc_runtime_unavailable_start_failure "$START_OUT"; then
+    exec "$REAL_BIN" "$@"
+  fi
   printf '%s\\n' "$START_OUT" >&2
   exit "$START_STATUS"
 fi
@@ -278,8 +340,59 @@ if [ -z "$HCC_ROOT" ]; then
   exec "$REAL_BIN" "$@"
 fi
 
-sanitize_peer_part() {
-  printf '%s' "$1" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9._-]/-/g; s/^-*//; s/-*$//' | cut -c 1-32
+# sess-04: sha1 hash of the FULL provider id/name, first 8 hex chars — must
+# match the JS shortHash() exactly (lib/core/peers/format.mjs). Name-based ids
+# that share a prefix used to collide into the same peer id.
+is_sha1_hex() {
+  [ "\${#1}" -eq 40 ] || return 1
+  case "$1" in
+    *[!0-9a-f]*) return 1 ;;
+  esac
+  return 0
+}
+
+peer_hash() {
+  local HASH=""
+  local OUTPUT=""
+
+  if command -v openssl >/dev/null 2>&1; then
+    OUTPUT=$(printf '%s' "$1" | openssl dgst -sha1 2>/dev/null || true)
+    HASH=$(printf '%s\n' "$OUTPUT" | awk 'NR == 1 { print $NF }' | tr '[:upper:]' '[:lower:]')
+    is_sha1_hex "$HASH" || HASH=""
+  fi
+
+  if [ -z "$HASH" ] && command -v sha1sum >/dev/null 2>&1; then
+    OUTPUT=$(printf '%s' "$1" | sha1sum 2>/dev/null || true)
+    HASH=$(printf '%s\n' "$OUTPUT" | awk 'NR == 1 { print $1 }' | tr '[:upper:]' '[:lower:]')
+    is_sha1_hex "$HASH" || HASH=""
+  fi
+
+  if [ -z "$HASH" ] && command -v shasum >/dev/null 2>&1; then
+    OUTPUT=$(printf '%s' "$1" | shasum 2>/dev/null || true)
+    HASH=$(printf '%s\n' "$OUTPUT" | awk 'NR == 1 { print $1 }' | tr '[:upper:]' '[:lower:]')
+    is_sha1_hex "$HASH" || HASH=""
+  fi
+
+  # A hello-cc environment always has node on PATH (hcc itself is a node CLI),
+  # so this fallback guarantees registration even on minimal systems without
+  # openssl/sha1sum/shasum. Digest must match the JS shortHash exactly.
+  if [ -z "$HASH" ] && command -v node >/dev/null 2>&1; then
+    HASH=$(printf '%s' "$1" | node -e 'let d="";process.stdin.on("data",c=>d+=c);process.stdin.on("end",()=>process.stdout.write(require("node:crypto").createHash("sha1").update(d).digest("hex")))' 2>/dev/null || true)
+    is_sha1_hex "$HASH" || HASH=""
+  fi
+
+  if ! is_sha1_hex "$HASH"; then
+    printf '%s\n' 'hello-cc: unable to derive peer id: no SHA-1 command produced a valid digest' >&2
+    return 1
+  fi
+
+  printf '%.8s' "$HASH"
+}
+
+provider_peer_id() {
+  local HASH_PART=""
+  HASH_PART=$(peer_hash "$1") || return 1
+  printf '%s-%s' '${tool.kind}' "$HASH_PART"
 }
 
 tty_peer_part() {
@@ -315,7 +428,7 @@ done
 if [ -n "$HCC_PEER" ]; then
   PEER_ID="$HCC_PEER"
 elif [ "$SUBCMD" = "resume" ] && [ -n "$RESUME_ID" ]; then
-  PEER_ID="${tool.kind}-\$(sanitize_peer_part "\${RESUME_ID:0:8}")"
+  PEER_ID=$(provider_peer_id "$RESUME_ID") || exec "$REAL_BIN" "$@"
 else
   PEER_ID="${tool.kind}-\$(tty_peer_part)"
 fi
@@ -352,14 +465,22 @@ detect_current_hcc_pane() {
   return 1
 }
 
+hcc_runtime_unavailable_start_failure() {
+  case "$1" in
+    *"No running web runtime found"*|*"No running hello-cc web runtime found"*|*"Runtime is not reachable"*|*"RUNTIME_NOT_RUNNING"*|*"RUNTIME_UNREACHABLE"*|*"RUNTIME_START_FAILED"*|*"RUNTIME_START_TIMEOUT"*)
+      return 0
+      ;;
+  esac
+  return 1
+}
+
 if detect_current_hcc_pane; then
   SESSION_PEER_ID=$(printf '%s' "$CURRENT_HCC_SESSION" | sed 's/^hcc-[^-]*-//')
   if [ -n "$SESSION_PEER_ID" ] && [ "$SESSION_PEER_ID" != "$CURRENT_HCC_SESSION" ]; then
     PEER_ID="$SESSION_PEER_ID"
   fi
   export HCC_PEER="$PEER_ID"
-  HCC_SKIP_SHIM_INSTALL=1 "$HCC_BIN" web >/dev/null 2>&1 || true
-  "$HCC_BIN" peer attach "$PEER_ID" --kind "${tool.kind}" --pane "$CURRENT_HCC_PANE" --cwd "$PWD" --force >/dev/null 2>&1 || true
+  HCC_RUNTIME_LOCAL_ONLY=1 "$HCC_BIN" peer attach "$PEER_ID" --kind "${tool.kind}" --pane "$CURRENT_HCC_PANE" --cwd "$PWD" --force >/dev/null 2>&1 || true
   exec "$REAL_BIN" "$@"
 fi
 
@@ -368,12 +489,15 @@ HCC_PROVIDER_LAUNCH_SCRIPT='REAL_BIN="$1"; shift; HCC_TMUX_BIN="\${HCC_TMUX_BIN:
 set +e
 # Wrap in shell so pane_pid stays as bash; Ctrl+C drops back to bash
 START_OUT_FILE=$(mktemp "\${TMPDIR:-/tmp}/hcc-shim-start.XXXXXX")
-(HCC_SKIP_SHIM_INSTALL=1 "$HCC_BIN" web >/dev/null 2>&1 || true; "$HCC_BIN" peer start "$PEER_ID" --kind "${tool.kind}" --restart-env -- bash -lc "$HCC_PROVIDER_LAUNCH_SCRIPT" _ "$REAL_BIN" "$@") >"$START_OUT_FILE" 2>&1
+(HCC_RUNTIME_LOCAL_ONLY=1 "$HCC_BIN" peer start "$PEER_ID" --kind "${tool.kind}" --restart-env -- bash -lc "$HCC_PROVIDER_LAUNCH_SCRIPT" _ "$REAL_BIN" "$@") >"$START_OUT_FILE" 2>&1
 START_STATUS=$?
 START_OUT=$(cat "$START_OUT_FILE" 2>/dev/null || true)
 rm -f "$START_OUT_FILE"
 set -e
 if [ "$START_STATUS" -ne 0 ]; then
+  if hcc_runtime_unavailable_start_failure "$START_OUT"; then
+    exec "$REAL_BIN" "$@"
+  fi
   printf '%s\\n' "$START_OUT" >&2
   exit "$START_STATUS"
 fi