@logicseek/hello-cc 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -16,6 +16,40 @@ the release description from the current changelog section. Use
 `npm run release:github` with `GH_TOKEN` or `GITHUB_TOKEN` only for local
 backfills.
 
+## 1.0.3
+
+### Summary
+
+This maintenance release keeps DeepSeek Harness on the normal npm `latest`
+channel and repairs the CLI, native-session and Web regressions identified while
+archiving 1.0.2. It retains the verified Cordis cleanup and recovery behavior.
+
+### Highlights
+
+- Preserve provider process identity during registration and discovery; update
+  owned hooks without discarding unrelated hooks or damaged user configuration.
+- Keep explicit hook database routing and quote generated terminal arguments.
+- Preserve the recorded origin of native submissions across restarts; peer
+  messages cannot gain local-user authority from their sender name or text.
+- Keep managed state directories and database files private without replacing
+  existing data or changing external database parent permissions. Terminal stream
+  buffers follow each session's project.
+- Bound streaming updates and long-message rendering while preserving complete
+  copied content, reader position, approval details and session ownership checks.
+- Isolate request parsing failures, retain local/proxy access contracts, serialize
+  Web startup and resolve terminal assets with npm dependency hoisting.
+- Native runtime ownership uses alternate ports for identifiable unrelated local
+  listeners while keeping one owner per project. Silent or legacy listeners are
+  rejected conservatively, and ownership remains until shutdown completes.
+
+### Validation
+
+The full restored regression suite and the installed official Harness package
+checks run against this composed release. The frozen file manifest and verification
+record live under `docs/verification/`; those source-only records are excluded
+from the npm package. Publication, current-device activation and real-model
+acceptance are recorded separately from source and CI checks.
+
 ## 1.0.2
 
 ### Summary

package/docs/dsh.md

@@ -8,7 +8,7 @@ The tested runtime is `@deepseek-ai/dsh@0.2.0-rc.2`, with matching plugin versio
 
 Supported hosts are Linux and macOS; on Windows use WSL. Native Windows shells are not supported. Device acceptance must be recorded separately from container verification.
 
-This integration is included in hello-cc 1.0.2 on the normal npm `latest` channel. With Node.js 24+, install it using `npm install -g @logicseek/hello-cc`. To test a source checkout instead, use:
+This integration has been included since hello-cc 1.0.2 on the normal npm `latest` channel. With Node.js 24+, install it using `npm install -g @logicseek/hello-cc`. To test a source checkout instead, use:
 
 ```bash
 node /absolute/path/to/hello-cc/bin/hcc.mjs --root /path/to/project dsh setup --mode cordis
@@ -113,7 +113,7 @@ Project overlays work directly from source. The managed manifest records the Cor
 
 ```bash
 npm pack --ignore-scripts
-dsh plugin --profile web add /absolute/path/to/logicseek-hello-cc-1.0.1.tgz
+dsh plugin --profile web add /absolute/path/to/logicseek-hello-cc-1.0.3.tgz
 ```
 
 Harness requires explicit approval for native dependency builds. If add returns `ERR_PNPM_IGNORED_BUILDS`, merge the following into the selected profile's `pnpm-workspace.yaml` and rerun the same add command. The default path is `~/.dsh/profiles/web/pnpm-workspace.yaml`; use the configured DSH_HOME when different. Preserve existing settings and approve only the candidate's pinned native dependency:
@@ -123,7 +123,7 @@ allowBuilds:
   node-pty@1.2.0-beta.15: true
 ```
 
-Harness selects bundles through the profile's `dsh.profile.bundles`; do not also load the project Cordis/hooks overlay. Actual npm installation, official add/repeated add/remove, profile resolution and real-model collaboration calls have passed. The actual macOS desktop profile was installed and hot-loaded on 2026-10-02. Its paired ACP worker completed real collaboration calls using the existing DeepSeek route. The initially configured desktop sub2api model returned HTTP 403 because that account only accepts official Codex clients. After the desktop default was observed to have changed to official DeepSeek, a new session completed hcc_state, hcc_message_send and a real completed turn with that existing selection. The original sub2api route restriction remains. The 1.0.2 release uses the normal npm latest channel. Harness manages profile package removal; project-overlay integration is disabled with `setup --mode off`.
+Harness selects bundles through the profile's `dsh.profile.bundles`; do not also load the project Cordis/hooks overlay. Actual npm installation, official add/repeated add/remove, profile resolution and real-model collaboration calls have passed. The actual macOS desktop profile was installed and hot-loaded on 2026-10-02. Its paired ACP worker completed real collaboration calls using the existing DeepSeek route. The initially configured desktop sub2api model returned HTTP 403 because that account only accepts official Codex clients. After the desktop default was observed to have changed to official DeepSeek, a new session completed hcc_state, hcc_message_send and a real completed turn with that existing selection. The original sub2api route restriction remains. The 1.0.3 release uses the normal npm latest channel. Harness manages profile package removal; project-overlay integration is disabled with `setup --mode off`.
 
 See Cordis/native acceptance (source checkout: `docs/verification/2026-10-02-dsh-cordis-native.md`), bridge acceptance (source checkout: `docs/verification/2026-10-02-dsh-official-bridge.md`), and the integration plan (source checkout: `docs/plans/2026-10-02-dsh-integration.md`). Real-model checks used temporary projects and owned processes, without replacing existing user sessions. The isolated order fixture passed artifact/evidence/handoff/lock-release/task-completion checks. See the Mac device receipt (source checkout: `docs/verification/2026-10-02-dsh-device-install.md`). Publication, deployment, other-device installation and genuine business acceptance remain separate delivery stages.
 

package/docs/dsh.zh-CN.md

@@ -8,7 +8,7 @@ DeepSeek Harness（`dsh`）可以与 Claude Code、Codex 共用 hello-cc 的项
 
 支持 Linux 和 macOS；Windows 使用 WSL，不支持原生 Windows shell。容器验证与实际设备验收分别记录。
 
-此接入包含在 hello-cc 1.0.2，沿用 npm 的 latest 标签。在 Node.js 24+ 环境执行 `npm install -g @logicseek/hello-cc` 安装。验证源码时，用本仓库的 CLI：
+此接入自 hello-cc 1.0.2 起提供，沿用 npm 的 latest 标签。在 Node.js 24+ 环境执行 `npm install -g @logicseek/hello-cc` 安装。验证源码时，用本仓库的 CLI：
 
 ```bash
 node /absolute/path/to/hello-cc/bin/hcc.mjs --root /path/to/project dsh setup --mode cordis
@@ -115,7 +115,7 @@ hcc native start --peer dsh-reviewer --provider dsh --binary /absolute/path/to/d
 
 ```bash
 npm pack --ignore-scripts
-dsh plugin --profile web add /absolute/path/to/logicseek-hello-cc-1.0.1.tgz
+dsh plugin --profile web add /absolute/path/to/logicseek-hello-cc-1.0.3.tgz
 ```
 
 Harness 的 pnpm 策略要求明确允许原生依赖构建。若首次 add 返回 `ERR_PNPM_IGNORED_BUILDS`，在所选 profile 的 `pnpm-workspace.yaml` 中合并以下配置，然后重跑同一 add 命令；默认位置是 `~/.dsh/profiles/web/pnpm-workspace.yaml`，自定义 DSH_HOME 时以该目录为准。保留文件中已有设置，只批准候选包使用的固定版本：
@@ -125,7 +125,7 @@ allowBuilds:
   node-pty@1.2.0-beta.15: true
 ```
 
-安装后由 Harness profile 的 `dsh.profile.bundles` 选择包；不要再同时加载项目 Cordis/hooks overlay。bundle 已通过实际 npm 安装、官方 add/重复 add/remove、隔离 profile 加载和真实模型工具调用。2026-10-02 已安装到本机真实 desktop profile 并热加载，配套 ACP 使用既有 DeepSeek 路由完成真实工具调用；初次桌面 sub2api 模型返回账户仅允许 Codex 官方客户端的 403；随后桌面默认模型已变为官方 DeepSeek，沿用当时配置的新建会话完成 hcc_state、hcc_message_send 和真实 completed 回合。原 sub2api 路由限制仍存在。1.0.2 沿用 npm latest 标签发布。profile 插件安装/移除由 Harness 管理，项目 overlay 则使用 `setup --mode off` 关闭。
+安装后由 Harness profile 的 `dsh.profile.bundles` 选择包；不要再同时加载项目 Cordis/hooks overlay。bundle 已通过实际 npm 安装、官方 add/重复 add/remove、隔离 profile 加载和真实模型工具调用。2026-10-02 已安装到本机真实 desktop profile 并热加载，配套 ACP 使用既有 DeepSeek 路由完成真实工具调用；初次桌面 sub2api 模型返回账户仅允许 Codex 官方客户端的 403；随后桌面默认模型已变为官方 DeepSeek，沿用当时配置的新建会话完成 hcc_state、hcc_message_send 和真实 completed 回合。原 sub2api 路由限制仍存在。1.0.3 沿用 npm latest 标签发布。profile 插件安装/移除由 Harness 管理，项目 overlay 则使用 `setup --mode off` 关闭。
 
 验证记录见 Cordis/native 验收 (源码目录: `docs/verification/2026-10-02-dsh-cordis-native.md`)、兼容桥记录 (源码目录: `docs/verification/2026-10-02-dsh-official-bridge.md`) 和详细接入计划 (源码目录: `docs/plans/2026-10-02-dsh-integration.md`)。真实模型验收在临时项目和自有进程中完成；既有会话与模型凭据保留；本机实际安装记录见 Mac 接入验收 (源码目录: `docs/verification/2026-10-02-dsh-device-install.md`)。Linux 容器已验证，实际 WSL/员工设备和真实业务签收尚未完成；隔离订单样例已完成报告、证据、交接、解锁与任务结束验证。
 

package/lib/cli/app.mjs

@@ -303,7 +303,7 @@ const { cmdInit, cmdRegister, cmdEnv, cmdJoin } = createLifecycleCommands({
   connect, now, tx, addEvent, printResult, CliError, parseOpts, intOpt,
   registerProjectActivity, resolveCurrentPeer, resolveTargetPeer,
   upsertPeer, upsertCanonicalPeerBinding, storedPeerIdentity, detectBranch,
-  writeGuidance, helpEnv, helpJoin, shellExports, path, process
+  readAncestorCliInfo, writeGuidance, helpEnv, helpJoin, shellExports, path, process
 });
 
 const { cmdTeam } = createTeamCommands({

package/lib/cli/commands/hook.mjs

@@ -89,13 +89,15 @@ async function cmdHook(ctx, args) {
   const dshProject = isDsh && !nativeOwner ? resolveProjectDatabase({ root: hccRoot, createStateDir: false }) : null;
   const nativeProject = nativeOwner ? resolveProjectDatabase({ root: hccRoot,
     db: process.env.HCC_DB, createStateDir: false }) : null;
+  const ordinaryDb = (ctx.root && path.resolve(ctx.root) === hccRoot ? ctx.dbPath : null) ||
+    process.env.HCC_DB;
   if (nativeProject && !fs.existsSync(nativeProject.db)) {
     throw new CliError('NATIVE_HOOK_OWNERSHIP_MISMATCH', 'Native hook database must already be owned by its runtime');
   }
   const hookCtx = {
     ...ctx,
     root: nativeProject?.root || dshProject?.root || hccRoot,
-    dbPath: nativeProject?.db || dshProject?.db || path.join(hccRoot, '.hello-cc', 'mesh.db')
+    dbPath: nativeProject?.db || dshProject?.db || (ordinaryDb ? path.resolve(ordinaryDb) : path.join(hccRoot, '.hello-cc', 'mesh.db'))
   };
   if (!nativeOwner) registerProjectActivity(hookCtx);
 

package/lib/cli/commands/lifecycle.mjs

@@ -4,10 +4,21 @@ export function createLifecycleCommands(deps) {
   const {
     connect, now, addEvent, printResult, CliError, parseOpts, intOpt,
     registerProjectActivity, resolveCurrentPeer, resolveTargetPeer,
-    upsertPeer, upsertCanonicalPeerBinding, detectBranch,
+    upsertPeer, upsertCanonicalPeerBinding, detectBranch, readAncestorCliInfo,
     writeGuidance, helpEnv, helpJoin, shellExports, path, process
   } = deps;
 
+  function registrationPid(opts) {
+    if (opts.pid !== undefined) return intOpt(opts, 'pid', process.ppid);
+    const ancestor = readAncestorCliInfo();
+    if (['claude', 'codex'].includes(ancestor?.kind) &&
+        (!opts.kind || opts.kind === ancestor.kind) &&
+        Number.isSafeInteger(ancestor.pid) && ancestor.pid > 1) {
+      return ancestor.pid;
+    }
+    return process.ppid;
+  }
+
   async function cmdInit(ctx, args) {
     registerProjectActivity(ctx);
     const opts = parseOpts(args, { booleans: ['no-guidance'] });
@@ -34,7 +45,7 @@ export function createLifecycleCommands(deps) {
       role: opts.role || '',
       worktree: path.resolve(opts.worktree || ctx.cwd),
       branch: opts.branch || detectBranch(ctx.cwd),
-      pid: intOpt(opts, 'pid', process.ppid),
+      pid: registrationPid(opts),
       status: opts.status || 'idle',
       capabilities: Array.isArray(opts.cap) ? opts.cap.join(',') : (opts.cap || opts.capabilities || '')
     };
@@ -67,7 +78,7 @@ export function createLifecycleCommands(deps) {
       role: opts.role || 'peer',
       worktree: path.resolve(opts.worktree || ctx.cwd),
       branch: opts.branch || detectBranch(ctx.cwd),
-      pid: intOpt(opts, 'pid', process.ppid),
+      pid: registrationPid(opts),
       status: opts.status || 'working',
       capabilities: Array.isArray(opts.cap) ? opts.cap.join(',') : (opts.cap || opts.capabilities || 'manual-shell')
     };

package/lib/cli/commands/query.mjs

@@ -1,5 +1,7 @@
 // Coordination query commands extracted from bin/hcc.mjs: peers, status, state, prompt.
 
+import { shellQuoteArg } from '../../format.mjs';
+
 export function createQueryCommands(deps) {
   const {
     connect, now, printResult, table, CliError, ACTIVE_PEER_TTL,
@@ -63,7 +65,10 @@ export function createQueryCommands(deps) {
     const peer = required(opts, 'peer', 'HCC_PEER');
     const kind = opts.kind || 'codex';
     const role = opts.role || 'peer';
-    const cmd = `node ${commandPath()} --root ${JSON.stringify(ctx.root)}`;
+    const cmd = ['node', commandPath(), '--root', ctx.root, '--db', ctx.dbPath].map(shellQuoteArg).join(' ');
+    const quotedPeer = shellQuoteArg(peer);
+    const quotedKind = shellQuoteArg(kind);
+    const quotedRole = shellQuoteArg(role);
     const text = `You are ${peer}, a ${kind} ${role} session working in this project.
 
 Use hcc as the shared coordination bus for this terminal session. This
@@ -71,23 +76,23 @@ project uses a flat peer mesh: there is no required main/worker hierarchy.
 
 Run these commands before changing files:
 
-${cmd} register --peer ${peer} --kind ${kind} --role ${role}
-${cmd} state --peer ${peer}
-${cmd} msg inbox --peer ${peer}
-${cmd} task next --peer ${peer}
+${cmd} register --peer ${quotedPeer} --kind ${quotedKind} --role ${quotedRole}
+${cmd} state --peer ${quotedPeer}
+${cmd} msg inbox --peer ${quotedPeer}
+${cmd} task next --peer ${quotedPeer}
 
 Coordination rules:
 - Claim exactly one task before editing.
 - If state shows a current task for ${peer}, continue that task before claiming another pending task.
 - Before editing a file, directory, module, or shared test resource, run:
-  ${cmd} lock acquire --peer ${peer} --resource <path-or-module> [--scope <scope>] --task <task-id>
+  ${cmd} lock acquire --peer ${quotedPeer} --resource <path-or-module> [--scope <scope>] --task <task-id>
 - If a lock is held by another peer, message that peer instead of editing:
-  ${cmd} msg send --from ${peer} --to <peer-id> --body "<question>"
+  ${cmd} msg send --from ${quotedPeer} --to <peer-id> --body "<question>"
 - Report progress or requests through msg send.
 - Before stopping, run tests, create a handoff, and release locks:
-  ${cmd} handoff create --from ${peer} --task <task-id> --summary "<what changed>" --tests "<commands/results>" --risks "<known risks>"
-  ${cmd} task done --peer ${peer} --id <task-id> --summary "<done summary>"
-  ${cmd} lock release --peer ${peer} --resource <path-or-module> [--scope <scope>]
+  ${cmd} handoff create --from ${quotedPeer} --task <task-id> --summary "<what changed>" --tests "<commands/results>" --risks "<known risks>"
+  ${cmd} task done --peer ${quotedPeer} --id <task-id> --summary "<done summary>"
+  ${cmd} lock release --peer ${quotedPeer} --resource <path-or-module> [--scope <scope>]
 `;
     printResult(ctx, { prompt: text }, () => text);
   }

package/lib/cli/commands/run.mjs

@@ -11,6 +11,7 @@ import { CliError } from '../../shared/errors.mjs';
 import { tx } from '../../db/schema.mjs';
 import { parseOpts, validateOpts } from '../../cli-args.mjs';
 import { runtimeProcessIdentity } from '../../runtime/state.mjs';
+import { ensurePrivateProjectBufferDirectory } from '../../runtime/project-path.mjs';
 import { withBufferDirectoryLease } from '../../runtime/buffer-directory-lease.mjs';
 import {
   externalBufferEvidence,
@@ -178,8 +179,7 @@ async function cmdRunWebManaged(ctx, { id, kind, role, cwd, command, commandArgs
   const ptyModule = await import('node-pty');
   const pty = ptyModule.default || ptyModule;
 
-  const bufsDir = path.join(ctx.root, '.hello-cc', BUFS_DIR_NAME);
-  fs.mkdirSync(bufsDir, { recursive: true });
+  const bufsDir = ensurePrivateProjectBufferDirectory(ctx.root, BUFS_DIR_NAME);
   const outFile = path.join(bufsDir, `${id}.out`);
   const inFile  = path.join(bufsDir, `${id}.in`);
   const resizeFile = path.join(bufsDir, `${id}.resize`);
@@ -219,8 +219,8 @@ async function cmdRunWebManaged(ctx, { id, kind, role, cwd, command, commandArgs
       }
       for (const file of bufferFiles) fs.rmSync(file, { force: true });
     }
-    fs.writeFileSync(inFile, '');
-    fs.writeFileSync(resizeFile, '');
+    fs.writeFileSync(inFile, '', { flag: 'wx', mode: 0o600 });
+    fs.writeFileSync(resizeFile, '', { flag: 'wx', mode: 0o600 });
     fs.writeFileSync(metaFile, JSON.stringify({
       id,
       generation: bufferGeneration,
@@ -231,7 +231,7 @@ async function cmdRunWebManaged(ctx, { id, kind, role, cwd, command, commandArgs
       wrapper_pid: process.pid,
       ...(publishingWrapperIdentity ? { wrapper_identity: publishingWrapperIdentity } : {}),
       publishing: true
-    }));
+    }), { flag: 'wx', mode: 0o600 });
 
     const db = connect(ctx);
     try {
@@ -359,7 +359,8 @@ async function cmdRunWebManaged(ctx, { id, kind, role, cwd, command, commandArgs
       if (!ownsExternalBufferGroup()) {
         throw new CliError('EXTERNAL_SESSION_SUPERSEDED', `External session ${id} was replaced during startup`);
       }
-      outFd = fs.openSync(outFile, 'w');
+      outFd = fs.openSync(outFile, fs.constants.O_WRONLY | fs.constants.O_CREAT |
+        fs.constants.O_EXCL | (fs.constants.O_NOFOLLOW || 0), 0o600);
     });
   } catch (error) {
     await failStartup(error?.code || 'external_buffer_open_failed');

package/lib/db/connection.mjs

@@ -5,6 +5,7 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
+import process from 'node:process';
 import { DatabaseSync } from 'node:sqlite';
 import { CliError } from '../shared/errors.mjs';
 import {
@@ -13,26 +14,93 @@ import {
 } from './schema.mjs';
 import { initSchemaWithBackup } from './migration-backup.mjs';
 import { readProjectRegistry } from '../runtime/projects.mjs';
-import { resolveProjectDatabase } from '../runtime/project-path.mjs';
+import { resolveProjectDatabase, secureExistingProjectStateDirectory } from '../runtime/project-path.mjs';
 
 const MIGRATION_FAILURE_COOLDOWN_MS = 5 * 60 * 1000;
 
+function managedDatabase(ctx) {
+  if (!ctx.root) return false;
+  const requestedRoot = path.resolve(ctx.root);
+  let canonicalRoot = requestedRoot;
+  try { canonicalRoot = fs.realpathSync.native(requestedRoot); } catch {}
+  const requestedDb = path.resolve(ctx.dbPath);
+  let canonicalCandidate = requestedDb;
+  try {
+    canonicalCandidate = path.join(fs.realpathSync.native(path.dirname(requestedDb)), path.basename(requestedDb));
+  } catch {}
+  return [requestedRoot, canonicalRoot].some(root =>
+    [requestedDb, canonicalCandidate].some(db => {
+      const relative = path.relative(path.join(root, '.hello-cc'), db);
+      return relative !== '' && relative !== '..' &&
+        !relative.startsWith(`..${path.sep}`) && !path.isAbsolute(relative);
+    }));
+}
+
+function secureManagedDatabaseFile(dbPath, create) {
+  let stat;
+  try { stat = fs.lstatSync(dbPath); }
+  catch (error) {
+    if (error?.code !== 'ENOENT') throw error;
+    if (!create) throw new CliError('NOT_FOUND', `Project database does not exist: ${dbPath}`);
+    try {
+      const fd = fs.openSync(dbPath, fs.constants.O_RDWR | fs.constants.O_CREAT |
+        fs.constants.O_EXCL | (fs.constants.O_NOFOLLOW || 0), 0o600);
+      fs.closeSync(fd);
+    } catch (creationError) {
+      if (creationError?.code !== 'EEXIST') throw creationError;
+    }
+    stat = fs.lstatSync(dbPath);
+  }
+  if (stat.isSymbolicLink() || !stat.isFile() || stat.nlink !== 1 ||
+      (typeof process.getuid === 'function' && stat.uid !== process.getuid())) {
+    throw new CliError('PROJECT_PATH_FORBIDDEN', `Project database must be an owned regular file: ${dbPath}`);
+  }
+  const fd = fs.openSync(dbPath, fs.constants.O_RDWR | (fs.constants.O_NOFOLLOW || 0));
+  try {
+    const opened = fs.fstatSync(fd);
+    if (!opened.isFile() || opened.dev !== stat.dev || opened.ino !== stat.ino) {
+      throw new CliError('PROJECT_PATH_FORBIDDEN', `Project database changed during validation: ${dbPath}`);
+    }
+    if (process.platform !== 'win32' && (opened.mode & 0o777) !== 0o600) fs.fchmodSync(fd, 0o600);
+    const current = fs.lstatSync(dbPath);
+    if (current.isSymbolicLink() || current.dev !== stat.dev || current.ino !== stat.ino) {
+      throw new CliError('PROJECT_PATH_FORBIDDEN', `Project database changed during validation: ${dbPath}`);
+    }
+  } finally { fs.closeSync(fd); }
+}
+
 export function createConnectionHelpers({ now, dedupePeerBindings, redactedLogText }) {
   let projectMigrationFanoutDepth = 0;
   const migratedRegisteredProjectDbs = new Set();
 
   function connect(ctx, options = {}) {
-    if (options.create === false && !fs.existsSync(ctx.dbPath)) {
-      throw new CliError('NOT_FOUND', `Project database does not exist: ${ctx.dbPath}`);
+    let dbPath = ctx.dbPath;
+    if (managedDatabase(ctx)) {
+      if (options.create !== false && !fs.existsSync(ctx.root)) {
+        fs.mkdirSync(ctx.root, { recursive: true });
+      }
+      const resolved = resolveProjectDatabase({
+        root: ctx.root,
+        db: dbPath,
+        createStateDir: options.create !== false,
+        createDatabaseParents: options.create !== false
+      });
+      dbPath = resolved.db;
+      if (options.create === false) secureExistingProjectStateDirectory(resolved.root);
+      secureManagedDatabaseFile(dbPath, options.create !== false);
+    } else {
+      if (options.create === false && !fs.existsSync(dbPath)) {
+        throw new CliError('NOT_FOUND', `Project database does not exist: ${dbPath}`);
+      }
+      if (options.create !== false) fs.mkdirSync(path.dirname(dbPath), { recursive: true });
     }
-    if (options.create !== false) fs.mkdirSync(path.dirname(ctx.dbPath), { recursive: true });
-    const db = new DatabaseSync(ctx.dbPath, { timeout: 5000 });
+    const db = new DatabaseSync(dbPath, { timeout: 5000 });
     db.exec('PRAGMA busy_timeout = 5000;');
     execWithBusyRetry(db, 'PRAGMA journal_mode = WAL;', { ignoreBusy: true });
     db.exec('PRAGMA synchronous = NORMAL;');
     db.exec('PRAGMA wal_autocheckpoint = 1000;');
     db.exec('PRAGMA foreign_keys = ON;');
-    initSchemaWithBackup(db, ctx.dbPath, {
+    initSchemaWithBackup(db, dbPath, {
       beforePostMigrationIndexes: dedupePeerBindings
     });
     if (options.migrateRegistered !== false) migrateRegisteredProjectDbs(ctx);
@@ -40,10 +108,13 @@ export function createConnectionHelpers({ now, dedupePeerBindings, redactedLogTe
   }
 
   function connectReadOnly(ctx) {
-    if (!fs.existsSync(ctx.dbPath) || !fs.statSync(ctx.dbPath).isFile()) {
-      throw new CliError('NOT_FOUND', `Project database does not exist: ${ctx.dbPath}`);
+    const dbPath = managedDatabase(ctx)
+      ? resolveProjectDatabase({ root: ctx.root, db: ctx.dbPath, createStateDir: false }).db
+      : ctx.dbPath;
+    if (!fs.existsSync(dbPath) || !fs.statSync(dbPath).isFile()) {
+      throw new CliError('NOT_FOUND', `Project database does not exist: ${dbPath}`);
     }
-    return new DatabaseSync(ctx.dbPath, { timeout: 5000, readOnly: true });
+    return new DatabaseSync(dbPath, { timeout: 5000, readOnly: true });
   }
 
   function migrateRegisteredProjectDbs(ctx) {
@@ -77,6 +148,8 @@ export function createConnectionHelpers({ now, dedupePeerBindings, redactedLogTe
         } catch {}
         let db = null;
         try {
+          secureExistingProjectStateDirectory(root);
+          secureManagedDatabaseFile(dbPath, false);
           db = new DatabaseSync(dbPath, { timeout: 5000 });
           db.exec('PRAGMA busy_timeout = 5000;');
           execWithBusyRetry(db, 'PRAGMA journal_mode = WAL;', { ignoreBusy: true });

package/lib/discover.mjs

@@ -11,6 +11,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import { spawnSync } from 'node:child_process';
+import { providerSessionPeerId } from './core/peers/session.mjs';
 
 // ─── Root detection ──────────────────────────────────────────────────────────
 
@@ -33,9 +34,8 @@ function fsExists(p) {
  * Derive a stable peer ID.
  *
  * Stability contract:
- *   - `claude --resume <old-id>`  →  claude-<old-id[:8]>   (same across restarts)
- *   - `codex resume <id>`         →  codex-<id[:8]>         (same across restarts)
- *   - fresh session               →  <kind>-<sessionId[:8]> (unique per session)
+ *   - provider session ID/name → the same full-value hash used by hooks/shims
+ *   - fresh session            → the same stable provider identity
  */
 export function derivePeerId(kind, sessionId, resumeId, explicitPeer = null) {
   if (explicitPeer) return explicitPeer;
@@ -44,7 +44,7 @@ export function derivePeerId(kind, sessionId, resumeId, explicitPeer = null) {
   if (process.env.HCC_PEER) return process.env.HCC_PEER;
 
   const base = resumeId || sessionId;
-  if (base && base.length >= 4) return `${kind}-${base.slice(0, 8)}`;
+  if (base) return providerSessionPeerId(kind, base);
 
   // Fallback: tty device number or pid
   const ttyNum = getTtyNum();