@timurproko/a1 0.1.1-dev.2 → 0.1.1-dev.4

package/README.md

@@ -44,6 +44,19 @@ npm start
 
 A1 control state uses `%APPDATA%\\A1` and `%LOCALAPPDATA%\\A1` on Windows, and the `a1` directory under XDG config/data/runtime roots on Unix. Override it only with declared `A1_*` variables such as `A1_CONFIG_DIR`, `A1_DATA_DIR`, `A1_RUNTIME_DIR`, `A1_DATABASE_PATH`, and `A1_ENDPOINT`. Pi profile roots remain `~/.a1/agent`, `~/.pi/agent`, and `~/.a1/sandbox`. This is a no-migration identity hard cut; see [`docs/architecture/toolchain.md`](docs/architecture/toolchain.md#identity-hard-cut-and-cleanup) before removing obsolete control state.
 
+### Branch lifecycle
+
+Create every topic branch and every `milestone/<name>` work branch from `develop`; never implement directly on `develop` or `master`. A source branch is closed only after this sequence completes:
+
+1. Validate the source branch with its required gates.
+2. Merge it into `develop` and push the merged `develop` commit.
+3. Switch to `develop`.
+4. Preview the exact cleanup set with `npm run branches:prune -- --branch <source>`.
+5. Safely delete the reviewed local source with `npm run branches:prune -- --apply --branch <source>`.
+6. When the non-protected remote source exists, delete it in the same cleanup with `npm run branches:prune -- --apply --branch <source> --remote origin`.
+
+The command defaults to a dry run against `develop`. It always retains `develop`, `master`, the checked-out branch, explicitly protected branches, and branches whose tips are not ancestors of the integration target. Apply mode uses only Git safe deletion (`git branch -d`), never force deletion. Use `--base <branch>` for another explicit integration target, `--protect <branch>` for additional protection, and `--json` for machine-readable review.
+
 Run the non-desktop gates with:
 
 ```sh

package/dist/src/foundation/release/bootstrap.js

@@ -42,9 +42,7 @@ export async function runBootstrap(options) {
             return await launchUi(retained, environment);
         }
     }
-    const candidate = await materializeRelease(options.packageRoot, paths.dataDir, {
-        onProgress: progress => output.write(`${PRODUCT_TEXT.diagnostic(`preparing ${progress.fileCount} installed release files; first launch may take a moment.`)}\n`),
-    });
+    const candidate = await materializeRelease(options.packageRoot, paths.dataDir);
     await stateStore.recordCandidate(candidate);
     state = await stateStore.read();
     if (!state.references.active) {

package/dist/src/foundation/release/update.js

@@ -106,9 +106,7 @@ export function createUpdateLifecycleCoordinator(environment = process.env, file
             }
         },
         async activateInstalled(packageRoot, targetVersion, phase) {
-            const candidate = await materializeRelease(packageRoot, paths.dataDir, {
-                onProgress: progress => output.stdout(`${PRODUCT_TEXT.diagnostic(`preparing ${progress.fileCount} installed release files; this one-time activation may take a moment.`)}\n`),
-            });
+            const candidate = await materializeRelease(packageRoot, paths.dataDir);
             if (candidate.packageVersion !== targetVersion)
                 throw new Error(`installed ${PRODUCT_TEXT.displayName} version ${candidate.packageVersion} does not match target ${targetVersion}`);
             await stateStore.recordCandidate(candidate);
@@ -198,14 +196,20 @@ export async function runSelfUpdate(options) {
             transaction = await transactionStore.advance("ownership-released");
         }
         if (phaseBefore(transaction.phase, "package-installed")) {
-            output.stdout(`${PRODUCT_TEXT.diagnostic(`is installing ${PRODUCT_TEXT.packageName}@${targetVersion}.`)}\n`);
-            const installation = await runNpm(runner, ["install", "--global", `${PRODUCT_PACKAGE}@${targetVersion}`], false, output, "start the global npm installation", false);
+            const installation = await runNpm(runner, ["install", "--global", "--loglevel=error", "--no-fund", "--no-audit", `${PRODUCT_PACKAGE}@${targetVersion}`], true, output, "start the global npm installation", false);
             if (installation.result === null)
                 throw new UpdateFailure(installation.exitCode, "npm process failed");
-            if (installation.result.code !== 0)
+            if (installation.result.code !== 0) {
+                if (installation.result.stdout.trim().length > 0)
+                    output.stderr(`${installation.result.stdout.trimEnd()}\n`);
                 throw new UpdateFailure(unsuccessfulCode(installation.result.code), `npm exited with status ${formatExitCode(installation.result.code)}`);
+            }
             transaction = await transactionStore.advance("package-installed");
         }
+        // Ownership can be reacquired after an interrupted installation (for
+        // example, if bare A1 is launched before the update is resumed). Recheck
+        // immediately before activation so recovery cannot start a second cohort.
+        await lifecycle.shutdownVerifiedOwners(targetVersion);
         await lifecycle.activateInstalled(packageRoot, targetVersion, async (phase) => { transaction = await transactionStore.advance(phase); });
         await transactionStore.advance("supervisor-verified");
         await transactionStore.finish("completed");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timurproko/a1",
-  "version": "0.1.1-dev.2",
+  "version": "0.1.1-dev.4",
   "description": "Standalone terminal workspace for supervised native and managed agents",
   "type": "module",
   "packageManager": "npm@11.13.0",
@@ -24,6 +24,7 @@
     "check:architecture": "node scripts/check-architecture.mjs && node scripts/product-identifier-policy.mjs --check && node scripts/check-product-identity-boundaries.mjs && node scripts/check-package-identity.mjs && node scripts/check-pinned-pi-source-ledger.mjs && node scripts/check-terminal-host-provenance.mjs",
     "check:customization-ready": "node scripts/check-owned-ui-customization-prerequisites.mjs",
     "check:deprecated": "node scripts/check-deprecated-dependencies.mjs",
+    "branches:prune": "node scripts/prune-merged-branches.mjs",
     "check": "npm run typecheck && npm run check:architecture && npm run check:customization-ready && npm run check:deprecated && npm test && npm run test:release",
     "validate:agent": "npm run check",
     "publish:next": "tsx scripts/publish-next.ts",