poe-code 4.0.11 → 4.0.13

package/packages/safejs/dist/modules/git.js

@@ -1,7 +1,7 @@
 import { execFile } from "node:child_process";
-import { mkdir, realpath, rm } from "node:fs/promises";
-import { basename, dirname, isAbsolute, relative, resolve, sep } from "node:path";
-import { hasOwnErrorCode } from "../error-codes.js";
+import { mkdir, readlink, realpath, rm, stat } from "node:fs/promises";
+import { dirname, isAbsolute, resolve } from "node:path";
+import { containsPath, isSamePath, resolveCanonicalPath } from "./canonical-path.js";
 const GIT_EXEC_MAX_BUFFER = 10 * 1024 * 1024;
 const SAVEPOINT_REF_PREFIX = "refs/poe-code/checkpoints/";
 export function makeGitModule(cwd) {
@@ -228,40 +228,20 @@ async function resolveWorktreePath(repoRoot, path, label) {
     const resolvedRoot = resolve(repoRoot);
     const resolvedPath = isAbsolute(path) ? resolve(path) : resolve(resolvedRoot, path);
     const canonicalRoot = await realpath(resolvedRoot);
-    const canonicalPath = await resolveCanonicalPath(resolvedPath);
-    const relativePath = relative(canonicalRoot, canonicalPath);
-    if (relativePath.length === 0 ||
-        relativePath === ".." ||
-        relativePath.startsWith(`..${sep}`) ||
-        isAbsolute(relativePath)) {
+    const canonicalPath = await resolveCanonicalPath({ realpath, readlink }, resolvedPath);
+    // A worktree lives somewhere under the repository, never at the repository root
+    // itself, so root-itself is rejected alongside anything outside it. Both answers
+    // come from the filesystem rather than the spelling: on a case-insensitive
+    // filesystem a differently cased path still names the repository root.
+    const [inside, isRootItself] = await Promise.all([
+        containsPath(stat, canonicalRoot, canonicalPath),
+        isSamePath(stat, canonicalPath, canonicalRoot)
+    ]);
+    if (!inside || isRootItself) {
         throw new Error(`${label} must be inside the git repository.`);
     }
     return canonicalPath;
 }
-async function resolveCanonicalPath(path) {
-    const missingSegments = [];
-    let current = path;
-    while (true) {
-        try {
-            const canonicalCurrent = await realpath(current);
-            return resolve(canonicalCurrent, ...missingSegments.reverse());
-        }
-        catch (error) {
-            if (!isNotFoundError(error)) {
-                throw error;
-            }
-            const parent = dirname(current);
-            if (parent === current) {
-                return resolve(path);
-            }
-            missingSegments.push(basename(current));
-            current = parent;
-        }
-    }
-}
-function isNotFoundError(error) {
-    return hasOwnErrorCode(error, "ENOENT");
-}
 function isBranchAlreadyExistsError(error, branch) {
     return (error instanceof Error &&
         error.message.includes(branch) &&

package/packages/safejs/dist/run.js

@@ -16,7 +16,7 @@ import { createMiscGlobals } from "./interp/globals/misc.js";
 import { createObjectArrayGlobals } from "./interp/globals/object-array.js";
 import { wrapCallerInjectedBindings } from "./interp/host-bridge.js";
 import { interpret, Scope } from "./interp/interpreter.js";
-import { createPromiseGlobals } from "./interp/promise.js";
+import { consumeSettledHostCall, createPromiseGlobals } from "./interp/promise.js";
 import { deepCopyToSandbox, isSandboxClosure, isSandboxPromise } from "./interp/values.js";
 import { resolveModuleImports } from "./modules/registry.js";
 import { activateOtelSink, getActiveOtelSpan, safeAddEvent } from "./observability/otel.js";
@@ -239,9 +239,7 @@ async function throwIfReturnedPromiseRejected(result) {
     await Promise.resolve();
     await Promise.resolve();
     if (rejected) {
-        if (result.returnValue.hostCall !== undefined) {
-            result.returnValue.hostCallJournal?.consume(result.returnValue.hostCall);
-        }
+        consumeSettledHostCall(result.returnValue);
         throw new UnhandledRejectionError(rejectionReason, result.returnValue.span);
     }
 }