@snappedly-tools/shipyard 0.9.2 → 0.11.0

package/dist/index.js

@@ -1,7 +1,7 @@
-import { CODEX_MODELS, resolveEnv, formatErrorMessage, buildLogDirectoryName } from './chunk-HXSZM52J.js';
-export { CODEX_MODELS, CODEX_REASONING_EFFORTS } from './chunk-HXSZM52J.js';
-import { CwdError, resolveCwd, getCurrentBranch, generateTempBranchName, assertNoSymlinkComponents, FileDisplay, ClackDisplay, WorktreeDockerSandboxFactory, SandboxConfig, Display, CLI_NAME, PRODUCT_NAME, pruneStale, create, runHostHooks, startSandbox, remove, makeSandboxFromHandle, withSandboxLifecycle, hasUncommittedChanges, shellQuote, registerShutdown, toSessionTransferHandle, syncOut, PromptError, CONFIG_DIR, LOGS_DIR, SandboxFactory, AgentError, SessionCaptureError, PromptExpansionTimeoutError, assertExcludesRepositoryRunner, resolveSafeRelativePath, CopyToWorktreeError, withTimeout, CopyToWorktreeTimeoutError, SilentDisplay, AgentIdleTimeoutError } from './chunk-57EEKW3R.js';
-export { createIsolatedSandboxProvider } from './chunk-57EEKW3R.js';
+import { CODEX_MODELS, resolveEnv, formatErrorMessage, buildLogDirectoryName } from './chunk-IVE7QDGC.js';
+export { CODEX_MODELS, CODEX_REASONING_EFFORTS, REASONING_EFFORTS } from './chunk-IVE7QDGC.js';
+import { CwdError, resolveCwd, getCurrentBranch, generateTempBranchName, assertNoSymlinkComponents, FileDisplay, ClackDisplay, WorktreeDockerSandboxFactory, SandboxConfig, Display, CLI_NAME, PRODUCT_NAME, pruneStale, create, runHostHooks, startSandbox, remove, makeSandboxFromHandle, withSandboxLifecycle, hasUncommittedChanges, shellQuote, registerShutdown, toSessionTransferHandle, syncOut, PromptError, CONFIG_DIR, LOGS_DIR, SandboxFactory, AgentError, SessionCaptureError, PromptExpansionTimeoutError, assertExcludesRepositoryRunner, resolveSafeRelativePath, CopyToWorktreeError, withTimeout, CopyToWorktreeTimeoutError, SilentDisplay, AgentIdleTimeoutError } from './chunk-BAP7BWQ2.js';
+export { createIsolatedSandboxProvider } from './chunk-BAP7BWQ2.js';
 import { extractStructuredOutput, StructuredOutputError } from './chunk-Z5C4LHVP.js';
 export { Output, StructuredOutputError } from './chunk-Z5C4LHVP.js';
 import { NodeContext, NodeFileSystem } from '@effect/platform-node';
@@ -1282,11 +1282,11 @@ var interactive = async (options) => {
         )
       )
     );
-    const handle = yield* Effect.gen(function* () {
+    const startResult = yield* Effect.gen(function* () {
       if (hooks?.host?.onWorktreeReady?.length) {
         yield* runHostHooks(hooks.host.onWorktreeReady, worktreeInfo.path);
       }
-      const startResult = yield* d.taskLog(
+      const startResult2 = yield* d.taskLog(
         "Starting sandbox",
         () => startSandbox({
           provider: sandboxProvider,
@@ -1297,7 +1297,7 @@ var interactive = async (options) => {
           copyTimeoutMs: options.timeouts?.copyToWorktreeMs
         })
       );
-      return startResult.handle;
+      return startResult2;
     }).pipe(
       Effect.tapError(
         () => worktreeInfo ? remove(worktreeInfo.path).pipe(
@@ -1305,6 +1305,7 @@ var interactive = async (options) => {
         ) : Effect.void
       )
     );
+    const handle = startResult.handle;
     return yield* Effect.gen(function* () {
       if (!handle.interactiveExec) {
         throw new Error(
@@ -1314,7 +1315,7 @@ var interactive = async (options) => {
       const interactiveExecFn = handle.interactiveExec.bind(handle);
       const sandbox = makeSandboxFromHandle(handle);
       const worktreePath = handle.worktreePath;
-      const applyToHost = () => syncOut(worktreeInfo.path, handle);
+      const applyToHost = () => syncOut(worktreeInfo.path, handle, startResult.copiedPaths);
       const lifecycleEffect = withSandboxLifecycle(
         {
           hostRepoDir,
@@ -1439,10 +1440,34 @@ var runRequiredSandboxHook = (sandbox, command, cwd, sudo) => Effect.flatMap(
   (result) => result.exitCode === 0 ? Effect.succeed(result) : Effect.fail(
     new Error(
       `Sandbox setup failed (exit ${result.exitCode}): ${command}
-${result.stderr}`
+${result.stderr || result.stdout}`
     )
   )
 );
+var logSetupFailure = async (hostRepoDir, branch, error) => {
+  const logPath = buildDefaultLogPath(hostRepoDir, branch, void 0, "setup");
+  try {
+    await assertNoSymlinkComponents(hostRepoDir, logPath, "setup log path");
+    await Effect.runPromise(
+      Effect.gen(function* () {
+        const display = yield* Display;
+        yield* display.status(
+          error instanceof Error ? error.message : String(error),
+          "error"
+        );
+      }).pipe(
+        Effect.provide(
+          Layer.provide(FileDisplay.layer(logPath), NodeFileSystem.layer)
+        )
+      )
+    );
+    console.error(`Sandbox setup log: ${logPath}`);
+  } catch (logError) {
+    console.error(
+      `Could not write sandbox setup log: ${logError instanceof Error ? logError.message : String(logError)}`
+    );
+  }
+};
 var buildSandboxHandle = (ctx, close) => {
   const {
     branch,
@@ -1715,6 +1740,7 @@ var createSandboxFromWorktree = async (options) => {
   let providerHandle;
   let sandbox;
   let sandboxRepoDir;
+  let copiedPaths = [];
   if (isTestMode) {
     sandbox = options._test.buildSandbox(worktreePath);
     sandboxRepoDir = worktreePath;
@@ -1742,6 +1768,7 @@ var createSandboxFromWorktree = async (options) => {
     providerHandle = startResult.handle;
     sandbox = startResult.sandbox;
     sandboxRepoDir = startResult.worktreePath;
+    copiedPaths = startResult.copiedPaths;
   }
   const sandboxOnReady = options.hooks?.sandbox?.onSandboxReady;
   const hostOnReady = options.hooks?.host?.onSandboxReady;
@@ -1767,6 +1794,9 @@ var createSandboxFromWorktree = async (options) => {
           concurrency: "unbounded"
         });
       }).pipe(
+        Effect.tapError(
+          (error) => Effect.promise(() => logSetupFailure(hostRepoDir, branch, error))
+        ),
         Effect.onError(
           () => providerHandle ? Effect.promise(() => providerHandle.close().catch(() => {
           })) : Effect.void
@@ -1774,7 +1804,11 @@ var createSandboxFromWorktree = async (options) => {
       )
     );
   }
-  const applyToHost = providerHandle ? () => syncOut(worktreePath, providerHandle) : () => Effect.void;
+  const applyToHost = providerHandle ? () => syncOut(
+    worktreePath,
+    providerHandle,
+    copiedPaths
+  ) : () => Effect.void;
   let closed = false;
   const sessionTransferHandle = toSessionTransferHandle(providerHandle);
   return buildSandboxHandle(
@@ -1801,6 +1835,7 @@ var createSandboxFromWorktree = async (options) => {
 var createSandbox = async (options) => {
   const { branch } = options;
   const isTestMode = !!options._test?.buildSandbox;
+  let copiedPaths = [];
   const { hostRepoDir, worktreePath, providerHandle, sandbox, sandboxRepoDir } = await Effect.runPromise(
     Effect.gen(function* () {
       const hostRepoDir2 = yield* resolveCwd(options.cwd);
@@ -1844,6 +1879,7 @@ var createSandbox = async (options) => {
           providerHandle2 = startResult.handle;
           sandbox2 = startResult.sandbox;
           sandboxRepoDir2 = startResult.worktreePath;
+          copiedPaths = startResult.copiedPaths;
         }
         const sandboxOnReady = options.hooks?.sandbox?.onSandboxReady;
         const hostOnReady = options.hooks?.host?.onSandboxReady;
@@ -1866,6 +1902,11 @@ var createSandbox = async (options) => {
             }
             yield* Effect.all(allEffects, { concurrency: "unbounded" });
           }).pipe(
+            Effect.tapError(
+              (error) => Effect.promise(
+                () => logSetupFailure(hostRepoDir2, branch, error)
+              )
+            ),
             Effect.onError(
               () => providerHandle2 ? Effect.promise(
                 () => providerHandle2.close().catch(() => {
@@ -1885,7 +1926,11 @@ var createSandbox = async (options) => {
       return { hostRepoDir: hostRepoDir2, worktreePath: worktreePath2, ...prepared };
     }).pipe(Effect.provide(NodeContext.layer))
   );
-  const applyToHost = providerHandle ? () => syncOut(worktreePath, providerHandle) : () => Effect.void;
+  const applyToHost = providerHandle ? () => syncOut(
+    worktreePath,
+    providerHandle,
+    copiedPaths
+  ) : () => Effect.void;
   let closed = false;
   const forceCleanup = () => {
     console.error(`
@@ -2107,7 +2152,7 @@ var createWorktree = async (options) => {
         const interactiveExecFn = handle.interactiveExec.bind(handle);
         const sandbox = makeSandboxFromHandle(handle);
         const worktreePath = handle.worktreePath;
-        const applyToHost = () => syncOut(worktreeInfo.path, handle);
+        const applyToHost = () => syncOut(worktreeInfo.path, handle, startResult.copiedPaths);
         const lifecycleEffect = withSandboxLifecycle(
           {
             hostRepoDir,
@@ -2225,7 +2270,7 @@ var createWorktree = async (options) => {
       const handle = startResult.handle;
       const sandboxRepoDir = startResult.worktreePath;
       const sandbox = makeSandboxFromHandle(handle);
-      const applyToHost = () => syncOut(worktreeInfo.path, handle);
+      const applyToHost = () => syncOut(worktreeInfo.path, handle, startResult.copiedPaths);
       const resolvedLogging = opts.logging ?? {
         type: "file",
         path: buildDefaultLogPath(