create-loopengine 0.1.60 → 0.1.61

package/dist/cli.d.ts

@@ -6,7 +6,10 @@ export interface ScaffoldOptions {
     templateDir?: string;
 }
 export declare function scaffold(options: ScaffoldOptions): string;
-export type UpgradeFileStatus = 'updated' | 'unchanged' | 'conflict' | 'skipped';
+/** `kept`: the project edited a file the template also changed, and
+ * `keepEdited` was set, so it was left exactly as it was (no merge, no
+ * conflict markers). */
+export type UpgradeFileStatus = 'updated' | 'unchanged' | 'conflict' | 'skipped' | 'kept';
 export interface UpgradeFileResult {
     file: string;
     status: UpgradeFileStatus;
@@ -57,6 +60,11 @@ export interface UpgradeOptions {
     /** Runs `npm install` in projectDir — defaults to a real one. Test-only
      * seam to avoid actually installing anything during tests. */
     runNpmInstall?: (projectDir: string) => void;
+    /** Leave a file the project edited untouched (status `kept`) instead of
+     * three-way merging it, so nothing ever gets conflict markers. For
+     * unattended upgrades (the console's Upgrade button): a half-merged
+     * adapters/http.ts would stop the server from starting at all. */
+    keepEdited?: boolean;
 }
 export declare function upgradeProject(options?: UpgradeOptions): UpgradeResult;
 export declare function main(argv?: string[]): void;

package/dist/cli.js

@@ -116,7 +116,7 @@ function threeWayMerge(minePath, basePath, theirsPath) {
     }
     return { merged: readFileSync(minePath, 'utf8'), conflicted };
 }
-function upgradeFile(candidate, baseTemplateDir, currentTemplateDir, projectDir) {
+function upgradeFile(candidate, baseTemplateDir, currentTemplateDir, projectDir, keepEdited = false) {
     const projectFilePath = join(projectDir, candidate.projectPath);
     const baseFilePath = join(baseTemplateDir, candidate.templatePath);
     const theirsFilePath = join(currentTemplateDir, candidate.templatePath);
@@ -132,6 +132,17 @@ function upgradeFile(candidate, baseTemplateDir, currentTemplateDir, projectDir)
         return { file: candidate.projectPath, status: 'unchanged' };
     }
     const mine = readFileSync(projectFilePath, 'utf8');
+    // The common cases need no merge (and so no git): a file the project
+    // never edited takes the new template as is, and one that already
+    // matches it has nothing to do.
+    if (mine === theirs)
+        return { file: candidate.projectPath, status: 'unchanged' };
+    if (mine === base) {
+        writeFileSync(projectFilePath, theirs);
+        return { file: candidate.projectPath, status: 'updated' };
+    }
+    if (keepEdited)
+        return { file: candidate.projectPath, status: 'kept' };
     const scratchDir = mkdtempSync(join(tmpdir(), 'create-loopengine-merge-'));
     const mineTmp = join(scratchDir, 'mine');
     const baseTmp = join(scratchDir, 'base');
@@ -162,7 +173,7 @@ export function upgradeProject(options = {}) {
     }
     const resolveBase = options.resolveBaseTemplateDir ?? fetchPublishedTemplateDir;
     const baseTemplateDir = resolveBase(fromVersion);
-    const files = UPGRADE_CANDIDATE_FILES.map((candidate) => upgradeFile(candidate, baseTemplateDir, currentTemplateDir, projectDir));
+    const files = UPGRADE_CANDIDATE_FILES.map((candidate) => upgradeFile(candidate, baseTemplateDir, currentTemplateDir, projectDir, options.keepEdited));
     const resolveLatestVersion = options.resolveLatestVersion ?? resolveLatestVersionFromNpm;
     const dependencies = bumpDependencies(projectDir, resolveLatestVersion);
     let npmInstall;
@@ -236,17 +247,23 @@ function bumpDependencies(projectDir, resolveLatestVersion) {
 }
 function parseUpgradeArgs(argv) {
     let from;
+    let json = false;
+    let keepEdited = false;
     for (let i = 0; i < argv.length; i++) {
         if (argv[i] === '--from')
             from = argv[++i];
+        else if (argv[i] === '--json')
+            json = true;
+        else if (argv[i] === '--keep-edited')
+            keepEdited = true;
     }
-    return { from };
+    return { from, json, keepEdited };
 }
 function printUpgradeSummary(result) {
     console.log(`Upgrading create-loopengine@${result.fromVersion} -> @${result.toVersion}`);
     console.log();
     for (const f of result.files) {
-        const label = f.status === 'updated' ? 'updated  ' : f.status === 'conflict' ? 'conflict ' : f.status === 'unchanged' ? 'unchanged' : 'skipped  ';
+        const label = f.status === 'updated' ? 'updated  ' : f.status === 'conflict' ? 'conflict ' : f.status === 'unchanged' ? 'unchanged' : f.status === 'kept' ? 'kept     ' : 'skipped  ';
         console.log(`  ${label}  ${f.file}`);
     }
     console.log();
@@ -275,8 +292,20 @@ function parseArgs(argv) {
 export function main(argv = process.argv.slice(2)) {
     try {
         if (argv[0] === 'upgrade') {
-            const { from } = parseUpgradeArgs(argv.slice(1));
-            printUpgradeSummary(upgradeProject({ from }));
+            const { from, json, keepEdited } = parseUpgradeArgs(argv.slice(1));
+            if (json) {
+                // One JSON object on stdout, for a program driving the upgrade
+                // (loopengine's console); errors become { error } with exit 1.
+                try {
+                    console.log(JSON.stringify(upgradeProject({ from, keepEdited })));
+                }
+                catch (err) {
+                    console.log(JSON.stringify({ error: err instanceof Error ? err.message : String(err) }));
+                    process.exitCode = 1;
+                }
+                return;
+            }
+            printUpgradeSummary(upgradeProject({ from, keepEdited }));
             return;
         }
         const { name } = parseArgs(argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-loopengine",
-  "version": "0.1.60",
+  "version": "0.1.61",
   "description": "Scaffold a new loopengine agent project — a runnable HTTP server with one example agent, in your own repo.",
   "license": "MIT",
   "type": "module",

package/template/_gitignore

@@ -6,3 +6,5 @@ dist
 .env
 *.log
 .DS_Store
+# Backups the console Upgrade button keeps of the files it changed.
+.upgrade-backups

package/template/adapters/http.ts

@@ -154,6 +154,9 @@ import {
   fetchLatestAbilityVersion,
   describeModelProviders,
   loopengineVersion,
+  describeUpgrade,
+  runUpgrade,
+  UpgradeError,
   setModelProviderKey,
   clearModelProviderKey,
   ModelKeyError,
@@ -3008,6 +3011,29 @@ const server = createServer(async (req, res) => {
       )
       return
     }
+    // The Settings section's Upgrade button (web/upgrade-admin.ts).
+    if (req.method === 'GET' && pathname === '/config/upgrade') {
+      res.writeHead(200, { 'content-type': 'application/json', 'cache-control': 'no-store' }).end(
+        JSON.stringify({ ...(await describeUpgrade()), canUpgrade: secretsProtected, restartsItself: exitOnCodeChange }),
+      )
+      return
+    }
+    if (req.method === 'POST' && pathname === '/config/upgrade') {
+      if (!secretsProtected) {
+        res.writeHead(403, { 'content-type': 'application/json' }).end(JSON.stringify({ error: 'Refusing to upgrade without LOOPENGINE_ADMIN_AUTH configured.' }))
+        return
+      }
+      try {
+        const outcome = await runUpgrade({ busy: () => sessionTurns.size + scheduler.running > 0 })
+        res.writeHead(200, { 'content-type': 'application/json' }).end(JSON.stringify({ ok: true, outcome, restarting: exitOnCodeChange }))
+      } catch (err) {
+        const status = err instanceof UpgradeError ? 409 : 500
+        res.writeHead(status, { 'content-type': 'application/json' }).end(JSON.stringify({ error: err instanceof Error ? err.message : String(err) }))
+        return
+      }
+      exitIfCodeChanged(res)
+      return
+    }
     if (req.method === 'GET' && pathname === '/config/models') {
       res.writeHead(200, { 'content-type': 'application/json' }).end(
         JSON.stringify({ ...describeModelProviders(listAgents(), (name) => getEntry(name)?.config), canSave: secretsProtected }),

package/template/package.json

@@ -9,7 +9,7 @@
     "cli": "tsx adapters/cli.ts"
   },
   "dependencies": {
-    "loopengine": "^0.1.75",
+    "loopengine": "^0.1.76",
     "actauth": "^0.0.12"
   },
   "devDependencies": {