@clawos-dev/clawd 0.2.66-beta.111.aeb004d → 0.2.67-beta.115.8d05743

package/dist/cli.cjs

@@ -85,9 +85,6 @@ var init_methods = __esm({
       "git:root",
       "git:branch",
       "git:branches",
-      "git:worktree:prefix",
-      "git:worktree:create",
-      "git:worktree:remove",
       "capabilities:get",
       // ---- persona:* (老板侧管理 + 插话；alice 走 persona-bound WS 简化协议，不在此白名单) ----
       "persona:create",
@@ -4584,7 +4581,7 @@ var init_persona_schemas = __esm({
 });
 
 // ../protocol/src/schemas.ts
-var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, ParsedEventSchema, SessionCreateArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SkillEntrySchema, AgentEntrySchema, AgentsListArgs, AgentsListResponseSchema, SessionSubscribeArgs, SessionPinArgs, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, GitWorktreePrefixArgs, GitWorktreePrefixResponseSchema, GitWorktreeCreateArgs, GitWorktreeCreateResponseSchema, GitWorktreeRemoveArgs, GitWorktreeRemoveResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, CancelQuestionArgs, CancelQuestionResponseSchema, AuthRequestFrameSchema, AuthOkFrameSchema, TunnelExitedEventSchema, InfoRunningSessionSchema, InfoResponseSchema;
+var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, ParsedEventSchema, SessionCreateArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SkillEntrySchema, AgentEntrySchema, AgentsListArgs, AgentsListResponseSchema, SessionSubscribeArgs, SessionPinArgs, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, CancelQuestionArgs, CancelQuestionResponseSchema, AuthRequestFrameSchema, AuthOkFrameSchema, TunnelExitedEventSchema, InfoRunningSessionSchema, InfoResponseSchema;
 var init_schemas = __esm({
   "../protocol/src/schemas.ts"() {
     "use strict";
@@ -4674,9 +4671,6 @@ var init_schemas = __esm({
       pinSortOrder: external_exports.number().int().nullable().optional(),
       // 用户在 NewSessionDialog 或 Edit modal 选择的 icon 标识；UI 端做 enum 兜底
       iconKey: external_exports.string().optional(),
-      // NewSessionDialog 勾选 worktree 创建的 session 才会持久化这两个字段
-      worktreeRoot: external_exports.string().min(1).optional(),
-      worktreeBranch: external_exports.string().min(1).optional(),
       // 由 session:fork 派生的 session 在 create 时记录源 session 的 sessionId（稳定 key，
       // 不受 parent clear / re-spawn 影响）；sidebar 据此挂 fork 图标。非 fork session 该字段缺省。
       // 旧字段 forkedFromToolSessionId 已弃用，daemon 启动时一次性迁移老数据
@@ -4897,9 +4891,6 @@ var init_schemas = __esm({
       effort: external_exports.string().optional(),
       // 用户在 NewSessionDialog 选择的 icon 标识；UI 端做 enum 兜底
       iconKey: external_exports.string().optional(),
-      // NewSessionDialog 勾选 worktree 时由 UI 传入，daemon 原样持久化，不做额外副作用
-      worktreeRoot: external_exports.string().min(1).optional(),
-      worktreeBranch: external_exports.string().min(1).optional(),
       // session:fork 派生 session 时由 UI 传入源 sessionId，daemon 写到 SessionFile.forkedFromSessionId
       forkedFromSessionId: external_exports.string().min(1).optional(),
       // owner-mode persona session：传此字段时 daemon 自行派生 cwd 和启动参数，
@@ -5064,25 +5055,6 @@ var init_schemas = __esm({
       branches: external_exports.array(external_exports.string()),
       head: external_exports.string().nullable()
     });
-    GitWorktreePrefixArgs = external_exports.object({}).optional();
-    GitWorktreePrefixResponseSchema = external_exports.object({
-      prefix: external_exports.string().min(1)
-    });
-    GitWorktreeCreateArgs = external_exports.object({
-      cwd: external_exports.string().min(1),
-      baseBranch: external_exports.string().min(1),
-      label: external_exports.string().min(1)
-    });
-    GitWorktreeCreateResponseSchema = external_exports.object({
-      worktreeRoot: external_exports.string().min(1),
-      branch: external_exports.string().min(1),
-      baseBranch: external_exports.string().min(1)
-    });
-    GitWorktreeRemoveArgs = external_exports.object({
-      worktreeRoot: external_exports.string().min(1),
-      worktreeBranch: external_exports.string().min(1)
-    });
-    GitWorktreeRemoveResponseSchema = external_exports.object({ ok: external_exports.literal(true) });
     HistoryRecentDirsArgs = external_exports.object({}).optional();
     RecentDirEntrySchema = external_exports.object({
       cwd: external_exports.string().min(1),
@@ -9306,7 +9278,7 @@ var require_multistream = __commonJS({
 var require_pino = __commonJS({
   "../node_modules/.pnpm/pino@9.14.0/node_modules/pino/pino.js"(exports2, module2) {
     "use strict";
-    var os16 = require("os");
+    var os15 = require("os");
     var stdSerializers = require_pino_std_serializers();
     var caller = require_caller();
     var redaction = require_redaction();
@@ -9353,7 +9325,7 @@ var require_pino = __commonJS({
     } = symbols;
     var { epochTime, nullTime } = time;
     var { pid } = process;
-    var hostname = os16.hostname();
+    var hostname = os15.hostname();
     var defaultErrorSerializer = stdSerializers.err;
     var defaultOptions = {
       level: "info",
@@ -20334,7 +20306,7 @@ var init_wire = __esm({
 // src/run-case/controller.ts
 async function runController(opts) {
   const now = opts.now ?? Date.now;
-  const cwd = opts.cwd ?? (0, import_node_fs26.mkdtempSync)(import_node_path28.default.join(import_node_os15.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs26.mkdtempSync)(import_node_path28.default.join(import_node_os14.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -20501,12 +20473,12 @@ async function runController(opts) {
   }
   return exitCode ?? 0;
 }
-var import_node_fs26, import_node_os15, import_node_path28;
+var import_node_fs26, import_node_os14, import_node_path28;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
     import_node_fs26 = require("fs");
-    import_node_os15 = __toESM(require("os"), 1);
+    import_node_os14 = __toESM(require("os"), 1);
     import_node_path28 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
@@ -22436,8 +22408,6 @@ var SessionManager = class {
       permissionMode: args.permissionMode,
       effort: args.effort,
       iconKey: args.iconKey,
-      worktreeRoot: args.worktreeRoot,
-      worktreeBranch: args.worktreeBranch,
       forkedFromSessionId: args.forkedFromSessionId,
       ownerPersonaId: args.ownerPersonaId,
       createdAt: iso,
@@ -27957,21 +27927,9 @@ init_protocol();
 // src/workspace/git.ts
 var import_node_child_process6 = require("child_process");
 var import_node_fs23 = __toESM(require("fs"), 1);
-var import_node_os13 = __toESM(require("os"), 1);
 var import_node_path25 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var pexec = (0, import_node_util.promisify)(import_node_child_process6.execFile);
-function formatChildProcessError(err) {
-  const e = err;
-  const stderrLine = (e.stderr ?? "").split("\n").map((s) => s.trim()).find((s) => s.length > 0);
-  if (stderrLine) return stderrLine;
-  const parts = [];
-  if (e.killed) parts.push("killed");
-  if (e.signal) parts.push(`signal=${e.signal}`);
-  if (e.code !== void 0 && e.code !== null) parts.push(`code=${e.code}`);
-  if (parts.length > 0) return parts.join(" ");
-  return e.message ?? "unknown error";
-}
 function normalizePath(p2) {
   const resolved = import_node_path25.default.resolve(p2);
   try {
@@ -28044,160 +28002,6 @@ async function listGitBranches(cwd) {
     return { branches: [], head: null };
   }
 }
-var LABEL_WHITELIST = /^[a-zA-Z0-9 _-]+$/;
-var MAX_SANITIZED_LABEL_LEN = 40;
-function sanitizeLabel(raw) {
-  if (typeof raw !== "string") return { sanitized: null, reason: "empty" };
-  if (raw.length === 0) return { sanitized: null, reason: "empty" };
-  if (!LABEL_WHITELIST.test(raw)) return { sanitized: null, reason: "invalid-chars" };
-  let s = raw.toLowerCase();
-  s = s.replace(/\s+/g, "-");
-  s = s.replace(/-+/g, "-");
-  s = s.replace(/^[-_]+|[-_]+$/g, "");
-  s = s.slice(0, MAX_SANITIZED_LABEL_LEN);
-  s = s.replace(/^[-_]+|[-_]+$/g, "");
-  if (!s) return { sanitized: null, reason: "empty" };
-  return { sanitized: s, reason: null };
-}
-function computePrefix() {
-  let username;
-  try {
-    username = import_node_os13.default.userInfo().username;
-  } catch {
-    username = void 0;
-  }
-  const { sanitized } = sanitizeLabel(username);
-  if (sanitized) return sanitized;
-  const rand = Math.floor(1e3 + Math.random() * 9e3).toString();
-  return `user-${rand}`;
-}
-function flattenToDirName(branch) {
-  return branch.replace(/\//g, "-");
-}
-function encodeClaudeProjectDir(absPath) {
-  if (!absPath || typeof absPath !== "string") return "";
-  let canonical = import_node_path25.default.resolve(absPath);
-  try {
-    canonical = import_node_fs23.default.realpathSync(canonical);
-  } catch {
-    try {
-      const parent = import_node_fs23.default.realpathSync(import_node_path25.default.dirname(canonical));
-      canonical = import_node_path25.default.join(parent, import_node_path25.default.basename(canonical));
-    } catch {
-    }
-  }
-  return canonical.replace(/[/.]/g, "-");
-}
-async function createWorktree(input) {
-  const { cwd, baseBranch, label } = input;
-  if (!cwd || typeof cwd !== "string") throw new Error("cwd \u4E0D\u80FD\u4E3A\u7A7A");
-  if (!baseBranch || typeof baseBranch !== "string") throw new Error("baseBranch \u4E0D\u80FD\u4E3A\u7A7A");
-  const labelResult = sanitizeLabel(label);
-  if (labelResult.reason === "invalid-chars") {
-    throw new Error("label \u4E0D\u80FD\u542B\u4E2D\u6587\u6216\u7279\u6B8A\u5B57\u7B26\uFF0C\u53EA\u5141\u8BB8\u82F1\u6587\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u7A7A\u683C\u3001\u8FDE\u5B57\u7B26\u3001\u4E0B\u5212\u7EBF");
-  }
-  if (labelResult.reason === "empty" || !labelResult.sanitized) {
-    throw new Error("label \u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u82F1\u6587\u5B57\u6BCD\u6216\u6570\u5B57");
-  }
-  const prefix = computePrefix();
-  const branch = `${prefix}/${labelResult.sanitized}`;
-  const dirName = flattenToDirName(branch);
-  const { isGitRoot } = await getGitRoot(cwd);
-  if (!isGitRoot) {
-    throw new Error(`\u76EE\u5F55 ${cwd} \u4E0D\u662F git repo \u6839`);
-  }
-  const parent = import_node_path25.default.dirname(import_node_path25.default.resolve(cwd));
-  if (parent === "/" || parent === import_node_path25.default.resolve(cwd)) {
-    throw new Error("repo \u5728\u78C1\u76D8\u6839\u76EE\u5F55\uFF0C\u65E0\u6CD5\u5728\u540C\u7EA7\u521B\u5EFA worktree");
-  }
-  const worktreeRoot = import_node_path25.default.join(parent, dirName);
-  try {
-    await pexec("git", ["-C", cwd, "fetch", "origin", baseBranch, "--no-tags"], {
-      timeout: 3e4
-    });
-  } catch (err) {
-    throw new Error(
-      `\u57FA\u51C6\u5206\u652F ${baseBranch} \u4E0D\u5B58\u5728\u6216 fetch \u8FDC\u7AEF\u5931\u8D25\uFF1A${formatChildProcessError(err)}`
-    );
-  }
-  try {
-    await pexec("git", ["-C", cwd, "rev-parse", "--verify", `refs/heads/${branch}`], {
-      timeout: 3e3
-    });
-    throw new Error(`\u5206\u652F ${branch} \u5DF2\u5B58\u5728\uFF0C\u8BF7\u6362\u4E00\u4E2A label`);
-  } catch (err) {
-    const msg = err.message;
-    if (msg.startsWith("\u5206\u652F ")) throw err;
-  }
-  if (import_node_fs23.default.existsSync(worktreeRoot)) {
-    throw new Error(`\u76EE\u5F55 ${worktreeRoot} \u5DF2\u5B58\u5728\uFF0C\u8BF7\u6362\u4E00\u4E2A label \u6216\u6E05\u7406\u540E\u91CD\u8BD5`);
-  }
-  try {
-    await pexec(
-      "git",
-      ["-C", cwd, "worktree", "add", worktreeRoot, "-b", branch, `origin/${baseBranch}`],
-      { timeout: 15e3 }
-    );
-  } catch (err) {
-    throw new Error(`\u521B\u5EFA worktree \u5931\u8D25\uFF1A${formatChildProcessError(err)}`);
-  }
-  return { worktreeRoot, branch, baseBranch };
-}
-async function removeWorktree(input) {
-  const { worktreeRoot, worktreeBranch } = input;
-  if (!worktreeRoot || !worktreeBranch) {
-    throw new Error("worktreeRoot \u548C worktreeBranch \u90FD\u4E0D\u80FD\u4E3A\u7A7A");
-  }
-  let repoRoot = null;
-  try {
-    const { stdout } = await pexec(
-      "git",
-      ["-C", worktreeRoot, "rev-parse", "--git-common-dir"],
-      { timeout: 3e3 }
-    );
-    const gitCommonDir = stdout.trim();
-    if (!gitCommonDir) throw new Error("empty git-common-dir");
-    const absGitCommon = import_node_path25.default.isAbsolute(gitCommonDir) ? gitCommonDir : import_node_path25.default.resolve(worktreeRoot, gitCommonDir);
-    repoRoot = import_node_path25.default.dirname(absGitCommon);
-  } catch {
-    repoRoot = null;
-  }
-  if (repoRoot) {
-    try {
-      await pexec("git", ["-C", repoRoot, "worktree", "remove", worktreeRoot, "--force"], {
-        timeout: 1e4
-      });
-    } catch (err) {
-      const stderr = err.stderr ?? "";
-      const lower = stderr.toLowerCase();
-      const vanished = lower.includes("not a working tree") || lower.includes("is not a working tree") || !import_node_fs23.default.existsSync(worktreeRoot);
-      if (!vanished) {
-        throw new Error(`\u6E05\u7406 worktree \u5931\u8D25\uFF1A${formatChildProcessError(err)}`);
-      }
-    }
-    try {
-      await pexec("git", ["-C", repoRoot, "branch", "-D", worktreeBranch], { timeout: 5e3 });
-    } catch (err) {
-      const stderr = err.stderr ?? "";
-      const lower = stderr.toLowerCase();
-      const vanished = lower.includes("not found") || lower.includes("no such");
-      if (!vanished) {
-        throw new Error(`\u6E05\u7406\u5206\u652F\u5931\u8D25\uFF1A${formatChildProcessError(err)}`);
-      }
-    }
-  }
-  try {
-    const encoded = encodeClaudeProjectDir(worktreeRoot);
-    if (encoded) {
-      const projectsRoot = import_node_path25.default.join(import_node_os13.default.homedir(), ".claude", "projects");
-      const target = import_node_path25.default.resolve(projectsRoot, encoded);
-      if (target.startsWith(projectsRoot + import_node_path25.default.sep) && target !== projectsRoot) {
-        import_node_fs23.default.rmSync(target, { recursive: true, force: true });
-      }
-    }
-  } catch {
-  }
-}
 
 // src/handlers/git.ts
 function buildGitHandlers() {
@@ -28216,36 +28020,10 @@ function buildGitHandlers() {
     const res = await listGitBranches(args.cwd);
     return { response: { type: "git:branches", ...res } };
   };
-  const worktreePrefix = async () => {
-    return {
-      response: { type: "git:worktree:prefix", prefix: computePrefix() }
-    };
-  };
-  const worktreeCreate = async (frame) => {
-    const args = GitWorktreeCreateArgs.parse(frame);
-    try {
-      const res = await createWorktree(args);
-      return { response: { type: "git:worktree:create", ...res } };
-    } catch (err) {
-      throw new ClawdError(ERROR_CODES.INTERNAL, err.message);
-    }
-  };
-  const worktreeRemove = async (frame) => {
-    const args = GitWorktreeRemoveArgs.parse(frame);
-    try {
-      await removeWorktree(args);
-      return { response: { type: "git:worktree:remove", ok: true } };
-    } catch (err) {
-      throw new ClawdError(ERROR_CODES.INTERNAL, err.message);
-    }
-  };
   return {
     "git:root": root,
     "git:branch": branch,
-    "git:branches": branches,
-    "git:worktree:prefix": worktreePrefix,
-    "git:worktree:create": worktreeCreate,
-    "git:worktree:remove": worktreeRemove
+    "git:branches": branches
   };
 }
 
@@ -28264,7 +28042,7 @@ function buildCapabilitiesHandlers(deps) {
 }
 
 // src/handlers/meta.ts
-var import_node_os14 = __toESM(require("os"), 1);
+var import_node_os13 = __toESM(require("os"), 1);
 init_protocol();
 
 // src/version.ts
@@ -28294,7 +28072,7 @@ function buildReadyFrame(deps, client) {
   return {
     version,
     protocolVersion: PROTOCOL_VERSION,
-    hostname: import_node_os14.default.hostname(),
+    hostname: import_node_os13.default.hostname(),
     os: process.platform,
     tools,
     runningSessions: info.runningSessions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.66-beta.111.aeb004d",
+  "version": "0.2.67-beta.115.8d05743",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",