@papercraneai/sandbox-agent 0.1.14 → 0.1.16

package/dist/index.js

@@ -464,54 +464,102 @@ async function findGitRoot(startDir) {
         dir = parent;
     }
 }
-// Pull template updates (git pull + conditional npm install)
+// Refresh: sync with remote using rebase. Auto-commits any local changes first
+// so the repo is always in a clean committed state before reconciling. If rebase
+// conflicts occur, aborts immediately and returns conflict info — the repo is
+// always left clean. The AI agent should call `papercrane workspace merge` to
+// enter deliberate conflict resolution.
 app.post("/pull-template", async (_req, res) => {
     const workdir = getWorkingDirectory();
     try {
-        // Find the git repo root (may be a parent of the working directory)
         const gitRoot = await findGitRoot(workdir);
         if (!gitRoot) {
             res.status(400).json({ error: "Working directory is not inside a git repository" });
             return;
         }
-        // Run git pull from the repo root
-        const pullOutput = runCommand("git pull", gitRoot);
-        console.log(`git pull output: ${pullOutput}`);
-        // Check if already up to date
-        if (pullOutput.includes("Already up to date")) {
-            res.json({ updated: false, files_changed: [], npm_installed: false });
+        const { workspaceRefresh } = await import("@papercraneai/cli/lib/workspace-ops.js");
+        const result = await workspaceRefresh(gitRoot);
+        if (!result.upToDate) {
+            res.status(409).json({
+                error: "conflicts_detected",
+                conflicting_files: result.conflictedFiles,
+                message: `Refresh blocked — conflicts in ${result.conflictedFiles?.length} file(s). Run 'papercrane workspace merge' to resolve.`,
+            });
             return;
         }
-        // Get list of changed files from the pull
-        // git diff HEAD@{1} --name-only shows what changed in the last pull
-        let filesChanged = [];
-        try {
-            const diffOutput = runCommand("git diff HEAD@{1} --name-only", gitRoot);
-            filesChanged = diffOutput.split("\n").filter(f => f.trim());
-        }
-        catch {
-            // If HEAD@{1} doesn't exist, just report the pull succeeded
-            filesChanged = ["(unable to determine changed files)"];
-        }
-        // Check if package.json changed — if so, run npm install
-        const packageJsonChanged = filesChanged.some(f => f === "package.json" || f === "package-lock.json");
+        const packageJsonChanged = result.filesChanged.some((f) => f === "package.json" || f === "package-lock.json");
         let npmInstalled = false;
         if (packageJsonChanged) {
-            console.log("package.json changed, running npm install...");
             await runNpmInstall(gitRoot);
             npmInstalled = true;
         }
-        // Ensure scaffold files still exist after pull
         await ensureAppScaffold(gitRoot);
-        res.json({ updated: true, files_changed: filesChanged, npm_installed: npmInstalled });
+        res.json({ updated: result.upToDate, files_changed: result.filesChanged, npm_installed: npmInstalled, auto_committed: result.autoCommitted });
     }
     catch (error) {
         log.error({ error: error instanceof Error ? error.message : String(error) }, "Pull template failed");
-        res.status(500).json({
-            error: error instanceof Error ? error.message : "Failed to pull template"
-        });
+        res.status(500).json({ error: error instanceof Error ? error.message : "Failed to pull template" });
     }
 });
+// ============================================================================
+// CLI PROXY ENDPOINTS
+// ============================================================================
+async function resolveGitRoot(res) {
+    const gitRoot = await findGitRoot(getWorkingDirectory());
+    if (!gitRoot) {
+        res.status(400).json({ error: "Not a git repository" });
+        return null;
+    }
+    return gitRoot;
+}
+app.get("/cli/status", async (_req, res) => {
+    const gitRoot = await resolveGitRoot(res);
+    if (!gitRoot)
+        return;
+    const { workspaceStatus } = await import("@papercraneai/cli/lib/workspace-ops.js");
+    res.json(await workspaceStatus(gitRoot));
+});
+app.post("/cli/refresh", async (_req, res) => {
+    const gitRoot = await resolveGitRoot(res);
+    if (!gitRoot)
+        return;
+    const { workspaceRefresh } = await import("@papercraneai/cli/lib/workspace-ops.js");
+    const result = await workspaceRefresh(gitRoot);
+    // If we start seeing publishes that change npm deps frequently, enable this
+    // block so refresh re-installs node_modules and bounces the dev-server PM2
+    // process (sandbox-agent stays up). Today most refreshes are dashboard source
+    // only, so paying the install + restart cost (and brief 502s on any open
+    // preview URL) on every push isn't worth it.
+    //
+    // const packageJsonChanged = result.filesChanged?.some((f: string) => f === "package.json" || f === "package-lock.json")
+    // if (packageJsonChanged) {
+    //   await runNpmInstall(gitRoot)
+    //   execSync("pm2 restart dev-server")
+    // }
+    // await ensureAppScaffold(gitRoot)
+    res.json(result);
+});
+app.post("/cli/publish", async (req, res) => {
+    const gitRoot = await resolveGitRoot(res);
+    if (!gitRoot)
+        return;
+    const { workspacePublish } = await import("@papercraneai/cli/lib/workspace-ops.js");
+    res.json(await workspacePublish(gitRoot, { message: req.body?.message }));
+});
+app.post("/cli/merge", async (_req, res) => {
+    const gitRoot = await resolveGitRoot(res);
+    if (!gitRoot)
+        return;
+    const { workspaceMerge } = await import("@papercraneai/cli/lib/workspace-ops.js");
+    res.json(await workspaceMerge(gitRoot));
+});
+app.post("/cli/unmerge", async (_req, res) => {
+    const gitRoot = await resolveGitRoot(res);
+    if (!gitRoot)
+        return;
+    const { workspaceUnmerge } = await import("@papercraneai/cli/lib/workspace-ops.js");
+    res.json(await workspaceUnmerge(gitRoot));
+});
 // File tree endpoint
 app.get("/files/tree", async (req, res) => {
     const subPath = req.query.path || "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@papercraneai/sandbox-agent",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Claude Agent SDK server for sandbox environments",
   "license": "MIT",
   "type": "module",
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.128",
+    "@papercraneai/cli": "*",
     "diff": "^5.2.0",
     "express": "^4.21.1",
     "multer": "^2.0.2",