@neta-art/cohub-cli 7.1.2 → 8.0.1

package/README.md

@@ -84,12 +84,37 @@ COHUB_SPACE_ID=<spaceId> cohub spaces prompt "message" --json
 
 Connect one local workspace to a Space and select Pi or Codex per turn.
 
+To keep using native terminals with ordinary Cohub Chats / Turns:
+使用原生终端，并同步到普通 Cohub Chat / Turn：
+
+```bash
+cohub runtime up -d --harness pi --harness codex
+cohub runtime attach --harness pi --harness codex
+# Reload Pi / restart Codex and approve its hook trust prompt.
+# 重载 Pi / 重启 Codex，并审核 Hook 信任提示。
+cohub runtime detach --harness pi --harness codex # Pause; retain data / 暂停，保留数据
+```
+
+`attach` explicitly authorizes this project's opened conversation history and raw native archives.
+The Runtime Supervisor is the single local Daemon: Pi / Codex integrations use its private IPC,
+while native Turn events use the existing Runtime WebSocket. Configuration is backed up, existing
+Runtime bindings are reused, and competing continuations fork at complete Turns without blocking native work. Requires Pi 0.85.1+ or Codex with stable
+Hooks enabled. User-level integrations remain inert outside opted-in directories. See
+[boundaries and privacy](../../docs/local-runtime.md#native-clients--原生客户端).
+
+`attach` 明确授权上传当前项目打开的对话历史与原生归档；复用现有绑定，配置修改前备份。
+冲突时按完整 Turn 分支，不阻塞本地执行。用户级集成在未授权目录中不会采集数据。
+
+
 ```bash
 cohub runtime up ./project --harness pi --harness codex
 cohub runtime up ./project --space <spaceId> --harness codex
 cohub -s <spaceId> spaces prompt "Continue" --harness codex
 cohub runtime status --space <spaceId>
 cohub runtime logs --space <spaceId> --follow
+cohub runtime up -d
+cohub runtime down
+cohub runtime up -n --name another-project
 ```
 
 Runtime diagnostics stay as redacted JSONL under the local Runtime state directory and
@@ -105,8 +130,21 @@ confirmation. See [Runtime details](../../docs/local-runtime.md).
 
 When `--space` is omitted, Runtime remembers a Space for the canonical local directory,
 account, and environment in `~/.config/cohub/runtime-spaces.json`. The first start creates
-and records a local Space; later starts reuse it. An explicit `--space` or `COHUB_SPACE_ID`
-overrides and updates the directory binding.
+and records a local Space after prompting; later starts recommend reuse. `-n` now means
+`--new` (boolean); use `--name <name>` for naming. An explicit `--space` or `COHUB_SPACE_ID`
+overrides and updates the directory binding. `--yes` accepts defaults and local execution;
+with explicit `--new`, it creates another Space.
+
+`-d` runs the same supervisor in the background and returns the URL, PID and log location.
+Readiness requires both Harness and files. If it is still starting after 30 seconds, exit
+code 2 means it remains in the background trying to connect. `status --json` includes
+local process and remote component status. `down` retains all data and requires `--yes`
+when executions remain unconfirmed. `logs --level warn --follow` shows sensitive events;
+foreground startup prints these automatically. Runtime commands never fall back to Home.
+
+普通使用只需 `cohub runtime up`，首次提示新建，后续优先复用。`-n` 是 `--new` 的简写，
+`--name` 单独指定名称。`-d` 后台运行并返回链接、PID 和日志位置；`down` 停止但保留所有数据。
+断网及临时凭证错误自动重试；断连不代表任务已停止，也不会自动重跑工具。
 
 ## Chats and prompts
 

package/dist/auth.js

@@ -1,5 +1,7 @@
 import { resolveCohubEnvironment } from "@neta-art/cohub";
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { randomUUID } from "node:crypto";
+import { withRuntimeSpaceBindingsLock } from "./runtime/space-binding.js";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { setTimeout as delay } from "node:timers/promises";
@@ -31,7 +33,14 @@ const deviceCodePath = (env = currentEnv()) => join(CONFIG_DIR, env === "dev" ?
 const legacyTokenPath = (env = currentEnv()) => join(CONFIG_DIR, env === "dev" ? "token.dev" : "token");
 const writePrivateJson = (path, value) => {
     mkdirSync(CONFIG_DIR, { recursive: true });
-    writeFileSync(path, `${JSON.stringify(value, null, 2)}\n`, { encoding: "utf-8", mode: 0o600 });
+    const temporary = `${path}.${randomUUID()}.tmp`;
+    try {
+        writeFileSync(temporary, `${JSON.stringify(value, null, 2)}\n`, { encoding: "utf-8", mode: 0o600, flag: "wx" });
+        renameSync(temporary, path);
+    }
+    finally {
+        rmSync(temporary, { force: true });
+    }
 };
 const readJson = (path) => {
     if (!existsSync(path))
@@ -55,6 +64,7 @@ const formPost = async (url, body) => {
         method: "POST",
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
         body,
+        signal: AbortSignal.timeout(15_000),
     });
     const contentType = response.headers.get("content-type") ?? "";
     const data = contentType.includes("application/json")
@@ -142,9 +152,25 @@ export async function requireAccessToken() {
         throw new AuthRequiredError();
     return token;
 }
-export async function refreshAccessToken(session = readAuthSession()) {
+let refreshInFlight = null;
+export function refreshAccessToken(session = readAuthSession()) {
     if (!session?.refreshToken)
-        throw new AuthRequiredError();
+        return Promise.reject(new AuthRequiredError());
+    if (refreshInFlight)
+        return refreshInFlight;
+    const path = sessionPath(session.env);
+    refreshInFlight = withRuntimeSpaceBindingsLock(async () => {
+        const current = readJson(path);
+        if (!current)
+            throw new AuthRequiredError();
+        // Another process may already have rotated this refresh token.
+        if (current.refreshToken !== session.refreshToken || current.updatedAt !== session.updatedAt)
+            return current.accessToken;
+        return performRefresh(current);
+    }, { path, lockPath: `${path}.refresh.lock` }).finally(() => { refreshInFlight = null; });
+    return refreshInFlight;
+}
+async function performRefresh(session) {
     const config = authConfig(session.env);
     const { response, data } = await formPost(tokenEndpoint(session.issuer), new URLSearchParams({
         client_id: session.clientId,
@@ -155,12 +181,19 @@ export async function refreshAccessToken(session = readAuthSession()) {
     }));
     if (!response.ok) {
         if (isUnrecoverableRefreshError(data)) {
-            clearAuthSession();
+            if (readJson(sessionPath(session.env))?.refreshToken === session.refreshToken)
+                clearAuthSession();
             return null;
         }
         throw new Error(formatAuthError(data, response.status));
     }
     const next = toSession(data, config, session.env, session);
+    // Never overwrite a login/logout that completed while the request was in flight.
+    const current = readJson(sessionPath(session.env));
+    if (!current)
+        throw new AuthRequiredError();
+    if (current.refreshToken !== session.refreshToken)
+        return current.accessToken;
     writePrivateJson(sessionPath(session.env), next);
     return next.accessToken;
 }

package/dist/client.js

@@ -1,8 +1,11 @@
 import { CohubClient, CohubHttpClient, readRequestSourceFromEnv } from "@neta-art/cohub";
-import { clearAuthSession, resolveAccessToken } from "./auth.js";
+import { clearAuthSession, readAuthSession, resolveAccessToken } from "./auth.js";
 const clientOptions = () => ({
     getAccessToken: resolveAccessToken,
-    onUnauthorized: clearAuthSession,
+    onUnauthorized: (context) => {
+        if (!process.env.COHUB_EXECUTION_TOKEN?.trim() && context.matchesRejectedToken(readAuthSession()?.accessToken ?? null))
+            clearAuthSession();
+    },
     requestSource: () => readRequestSourceFromEnv(process.env, { via: "cli" }) ?? {
         via: "cli",
     },

package/dist/commands/runtime.d.ts

@@ -1,4 +1,3 @@
 import type { Command } from "commander";
-export declare const resolveLocalSpaceName: (root: string, name?: string) => string;
-export declare function parseRuntimeHarnesses(values: string[]): ("pi" | "codex")[];
+export { resolveLocalSpaceName, parseRuntimeHarnesses } from "../runtime/launch.js";
 export declare function registerRuntime(program: Command): void;