@basou/cli 0.63.0 → 0.64.0

package/dist/index.js

@@ -2105,13 +2105,12 @@ async function assertWorkspaceInitialized3(basouRoot) {
 }
 
 // src/commands/exec.ts
-import { mkdir as mkdir2 } from "fs/promises";
+import { mkdir as mkdir2, rm } from "fs/promises";
 import { homedir as homedir4 } from "os";
 import { join as join6 } from "path";
 import {
   acquireLock as acquireLock3,
   assertBasouRootSafe as assertBasouRootSafe4,
-  assertLockStoreSafe as assertLockStoreSafe2,
   assertSessionStoreSafe,
   basouPaths as basouPaths6,
   ChildProcessRunner,
@@ -2152,10 +2151,8 @@ async function runExec(command, args, options, ctx = {}) {
   await assertBasouRootSafe4(paths.root);
   const manifest = await readManifest3(paths);
   await assertSessionStoreSafe(paths);
-  await assertLockStoreSafe2(paths);
   const sessionId = prefixedUlid3("ses");
   const sessionDir = join6(paths.sessions, sessionId);
-  await mkdir2(sessionDir, { recursive: true });
   const appendEvent = ctx.appendEvent ?? (async (_sessionDir, event) => {
     await coreAppendChainedEvent(paths, sessionId, event);
   });
@@ -2169,7 +2166,22 @@ async function runExec(command, args, options, ctx = {}) {
     workspaceId: manifest.workspace.id,
     startedAt
   });
-  await writeYamlFile(sessionYamlPath, session);
+  const initialLock = await acquireLock3(paths, "session", sessionId);
+  try {
+    try {
+      await mkdir2(sessionDir, { recursive: true });
+    } catch (error) {
+      throw new Error("Failed to create session directory", { cause: error });
+    }
+    try {
+      await writeYamlFile(sessionYamlPath, session);
+    } catch (error) {
+      await rm(sessionDir, { recursive: true, force: true }).catch(() => void 0);
+      throw error;
+    }
+  } finally {
+    await initialLock.release();
+  }
   await appendEvent(sessionDir, {
     schema_version: EVENT_SCHEMA_VERSION3,
     type: "session_started",
@@ -2951,7 +2963,7 @@ async function loadHostsConfig(configPath = DEFAULT_HOSTS_CONFIG_PATH) {
 // src/lib/provenance-actions.ts
 import {
   assertApprovalStoreSafe,
-  assertLockStoreSafe as assertLockStoreSafe4,
+  assertLockStoreSafe as assertLockStoreSafe3,
   assertTaskStoreSafe,
   readMarkdownFile as readMarkdownFile5,
   renderDecisions as renderDecisions2,
@@ -2963,14 +2975,14 @@ import {
 
 // src/commands/import.ts
 import { createReadStream } from "fs";
-import { readdir, readFile as readFile2, rm, stat as stat3 } from "fs/promises";
+import { readdir, readFile as readFile2, rm as rm2, stat as stat3 } from "fs/promises";
 import { homedir as homedir7 } from "os";
 import { basename as basename4, dirname as dirname3, join as join9, resolve as resolve6 } from "path";
 import { createInterface } from "readline";
 import {
   AGENT_INFRA_DIRS as AGENT_INFRA_DIRS2,
   assertBasouRootSafe as assertBasouRootSafe6,
-  assertLockStoreSafe as assertLockStoreSafe3,
+  assertLockStoreSafe as assertLockStoreSafe2,
   assertSessionStoreSafe as assertSessionStoreSafe2,
   basouPaths as basouPaths8,
   CLAUDE_IMPORT_SOURCE,
@@ -3144,7 +3156,7 @@ async function resolveImportTarget(ctx) {
 }
 async function importDerivedSessions(paths, manifest, options, sourceKind, candidates, projectPaths, boundaryDeclared) {
   await assertSessionStoreSafe2(paths);
-  if (options.dryRun !== true) await assertLockStoreSafe3(paths);
+  if (options.dryRun !== true) await assertLockStoreSafe2(paths);
   const { byExternalId: existingByExternalId, notDirectories } = await loadExistingByExternalId(
     paths,
     sourceKind
@@ -3236,7 +3248,7 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
     if (priors.length > 0 && options.force === true) {
       if (options.dryRun !== true) {
         for (const { sessionId } of priors) {
-          await rm(join9(paths.sessions, sessionId), { recursive: true, force: true });
+          await rm2(join9(paths.sessions, sessionId), { recursive: true, force: true });
         }
       }
       counts.replaced++;
@@ -3726,7 +3738,7 @@ async function refreshAll(args) {
   if (!dryRun) {
     await assertTaskStoreSafe(paths);
     await assertApprovalStoreSafe(paths);
-    await assertLockStoreSafe4(paths);
+    await assertLockStoreSafe3(paths);
   }
   const claudeCode = await importClaudeCode(options, ctx);
   const codex = await importCodex(options, ctx);
@@ -8749,7 +8761,7 @@ import { homedir as homedir10 } from "os";
 import { join as join13 } from "path";
 import {
   assertApprovalStoreSafe as assertApprovalStoreSafe2,
-  assertLockStoreSafe as assertLockStoreSafe5,
+  assertLockStoreSafe as assertLockStoreSafe4,
   assertTaskStoreSafe as assertTaskStoreSafe2,
   findErrorCode as findErrorCode8
 } from "@basou/core";
@@ -8814,7 +8826,7 @@ function hms(date) {
 async function runImports(deps) {
   await assertTaskStoreSafe2(deps.paths);
   await assertApprovalStoreSafe2(deps.paths);
-  await assertLockStoreSafe5(deps.paths);
+  await assertLockStoreSafe4(deps.paths);
   const claude = await importClaudeCode(deps.importOptions, deps.ctx);
   const codex = await importCodex(deps.importOptions, deps.ctx);
   return { claude, codex, changed: changedCount(claude) + changedCount(codex) };
@@ -9636,13 +9648,12 @@ function unattachedLines(u) {
 }
 
 // src/commands/run.ts
-import { mkdir as mkdir3, readFile as readFile7 } from "fs/promises";
+import { mkdir as mkdir3, readFile as readFile7, rm as rm3 } from "fs/promises";
 import { homedir as homedir12 } from "os";
 import { join as join14 } from "path";
 import {
   acquireLock as acquireLock5,
   assertBasouRootSafe as assertBasouRootSafe12,
-  assertLockStoreSafe as assertLockStoreSafe6,
   assertSessionStoreSafe as assertSessionStoreSafe3,
   basouPaths as basouPaths17,
   ChildProcessRunner as ChildProcessRunner2,
@@ -9720,10 +9731,8 @@ async function runTrackedTool(args, options, ctx, adapter) {
   await assertBasouRootSafe12(paths.root);
   const manifest = await readManifest10(paths);
   await assertSessionStoreSafe3(paths);
-  await assertLockStoreSafe6(paths);
   const sessionId = prefixedUlid4("ses");
   const sessionDir = join14(paths.sessions, sessionId);
-  await mkdir3(sessionDir, { recursive: true });
   const appendEvent = ctx.appendEvent ?? (async (_sessionDir, event) => {
     await coreAppendChainedEvent2(paths, sessionId, event);
   });
@@ -9738,7 +9747,22 @@ async function runTrackedTool(args, options, ctx, adapter) {
     startedAt,
     source: adapter.metadata
   });
-  await writeYamlFile2(sessionYamlPath, session);
+  const initialLock = await acquireLock5(paths, "session", sessionId);
+  try {
+    try {
+      await mkdir3(sessionDir, { recursive: true });
+    } catch (error) {
+      throw new Error("Failed to create session directory", { cause: error });
+    }
+    try {
+      await writeYamlFile2(sessionYamlPath, session);
+    } catch (error) {
+      await rm3(sessionDir, { recursive: true, force: true }).catch(() => void 0);
+      throw error;
+    }
+  } finally {
+    await initialLock.release();
+  }
   await appendEvent(sessionDir, {
     schema_version: EVENT_SCHEMA_VERSION5,
     type: "session_started",
@@ -10107,7 +10131,7 @@ import {
   acquireLock as acquireLock6,
   appendEventToExistingSession as appendEventToExistingSession3,
   assertBasouRootSafe as assertBasouRootSafe13,
-  assertLockStoreSafe as assertLockStoreSafe7,
+  assertLockStoreSafe as assertLockStoreSafe5,
   basouPaths as basouPaths18,
   displayPath as displayPath3,
   EVENT_SCHEMA_VERSION as EVENT_SCHEMA_VERSION6,
@@ -10743,7 +10767,7 @@ async function doRunSessionRechain(options, ctx) {
   const repositoryRoot = await resolveRepositoryRootForSession(cwd, "rechain");
   const paths = basouPaths18(repositoryRoot);
   await assertWorkspaceInitialized11(paths.root);
-  await assertLockStoreSafe7(paths);
+  await assertLockStoreSafe5(paths);
   const sessionIds = options.session !== void 0 ? [await resolveSessionId3(paths, options.session)] : await enumerateAllSessionNames(paths);
   const dryRun = options.dryRun === true;
   const rows = [];
@@ -11032,7 +11056,7 @@ import { join as join16 } from "path";
 import {
   archiveTask,
   assertBasouRootSafe as assertBasouRootSafe16,
-  assertLockStoreSafe as assertLockStoreSafe8,
+  assertLockStoreSafe as assertLockStoreSafe6,
   basouPaths as basouPaths21,
   createTaskWithEvent,
   deleteTask,
@@ -11570,7 +11594,7 @@ async function doRunTaskReconcile(options, ctx) {
   const repositoryRoot = await resolveRepositoryRootForTask(cwd, "reconcile");
   const paths = basouPaths21(repositoryRoot);
   await assertWorkspaceInitialized13(paths.root);
-  await assertLockStoreSafe8(paths);
+  await assertLockStoreSafe6(paths);
   const manifest = await readManifest13(paths);
   const nowProvider = ctx.nowProvider ?? (() => /* @__PURE__ */ new Date());
   const write = options.write === true;
@@ -14242,7 +14266,7 @@ async function assertWorkspaceInitialized15(basouRoot) {
 function readBuildStamp() {
   if (false) return void 0;
   try {
-    return JSON.parse('{"version":"0.63.0","commit":"5a404e5","committedAt":"2026-10-03T10:49:51+09:00"}');
+    return JSON.parse('{"version":"0.64.0","commit":"1caea85","committedAt":"2026-10-04T11:34:39+09:00"}');
   } catch {
     return void 0;
   }