@atolis-hq/wake 0.2.16 → 0.2.17

package/dist/src/cli/sandbox-command.js

@@ -4,7 +4,7 @@ import { createRunnerCliAdapter } from '../adapters/runner/runner-cli-adapter.js
 import { runSandboxResumeCommand } from './sandbox-resume.js';
 import { runSelfUpdateCommand, runSelfUpdateLoop } from './self-update-command.js';
 import { runStopCommand } from './stop-command.js';
-import { wakeVersion } from '../version.js';
+import { resolveWakeVersion, wakeVersion } from '../version.js';
 async function ensureDockerfile(input) {
     const targetPath = resolve(input.wakeRoot, 'docker', 'Dockerfile');
     try {
@@ -89,6 +89,7 @@ export async function runSandboxCommand(input) {
             throw new Error('Sandbox build requires config.dev.repoRoot');
         }
         const effectiveDevMode = input.config.dev?.mode ?? 'packaged';
+        const buildVersion = effectiveDevMode === 'source' ? resolveWakeVersion({ repoRoot }) : wakeVersion;
         await ensureDockerfile({
             wakeRoot: input.wakeRoot,
             devMode: effectiveDevMode,
@@ -98,7 +99,9 @@ export async function runSandboxCommand(input) {
             image: input.config.sandbox.image,
             dockerfile: resolve(input.wakeRoot, 'docker', 'Dockerfile'),
             contextDir: repoRoot,
-            ...(effectiveDevMode === 'packaged' ? { buildArgs: { WAKE_VERSION: wakeVersion } } : {}),
+            buildArgs: effectiveDevMode === 'packaged'
+                ? { WAKE_VERSION: buildVersion }
+                : { WAKE_BUILD_TAG: buildVersion },
         });
         return;
     }

package/dist/src/version.js

@@ -1 +1,127 @@
-export const wakeVersion = "0.2.16+g44a8d26";
+import { execFileSync } from 'node:child_process';
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+const defaultRepoRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..');
+function gitOutputFromRoot(repoRoot, args) {
+    try {
+        return execFileSync('git', args, {
+            cwd: repoRoot,
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+        }).trim();
+    }
+    catch {
+        return '';
+    }
+}
+function defaultReadTextFile(path) {
+    try {
+        return readFileSync(path, 'utf8');
+    }
+    catch {
+        return undefined;
+    }
+}
+function defaultListTextFiles(path) {
+    if (!existsSync(path)) {
+        return [];
+    }
+    const files = [];
+    for (const entry of readdirSync(path, { withFileTypes: true })) {
+        const entryPath = resolve(path, entry.name);
+        if (entry.isDirectory()) {
+            files.push(...defaultListTextFiles(entryPath));
+        }
+        else if (entry.isFile()) {
+            const content = defaultReadTextFile(entryPath);
+            if (content !== undefined) {
+                files.push({ path: entryPath, content });
+            }
+        }
+    }
+    return files;
+}
+function currentHeadHash(repoRoot, readTextFile) {
+    const head = readTextFile(resolve(repoRoot, '.git', 'HEAD'))?.trim();
+    if (head === undefined || head.length === 0) {
+        return '';
+    }
+    if (!head.startsWith('ref: ')) {
+        return head;
+    }
+    const refPath = head.slice('ref: '.length).trim();
+    return readTextFile(resolve(repoRoot, '.git', ...refPath.split('/')))?.trim() ?? '';
+}
+function looseTagRefs(repoRoot, listTextFiles) {
+    const tagsRoot = resolve(repoRoot, '.git', 'refs', 'tags');
+    return listTextFiles(tagsRoot).map((file) => ({
+        name: file.path.replaceAll('\\', '/').slice(tagsRoot.replaceAll('\\', '/').length + 1),
+        hash: file.content.trim(),
+    }));
+}
+function packedTagRefs(repoRoot, readTextFile) {
+    const packedRefs = readTextFile(resolve(repoRoot, '.git', 'packed-refs'));
+    if (packedRefs === undefined) {
+        return [];
+    }
+    const refs = [];
+    let previousTag;
+    for (const line of packedRefs.split(/\r?\n/)) {
+        if (line.length === 0 || line.startsWith('#')) {
+            continue;
+        }
+        if (line.startsWith('^')) {
+            if (previousTag !== undefined) {
+                previousTag.hash = line.slice(1).trim();
+            }
+            continue;
+        }
+        previousTag = undefined;
+        const [hash, ref] = line.split(' ');
+        if (hash !== undefined && ref?.startsWith('refs/tags/') === true) {
+            previousTag = { name: ref.slice('refs/tags/'.length), hash };
+            refs.push(previousTag);
+        }
+    }
+    return refs;
+}
+function exactTagFromGitFiles(repoRoot, readTextFile, listTextFiles) {
+    const headHash = currentHeadHash(repoRoot, readTextFile);
+    if (headHash.length === 0) {
+        return '';
+    }
+    const matchingTag = [
+        ...looseTagRefs(repoRoot, listTextFiles),
+        ...packedTagRefs(repoRoot, readTextFile),
+    ].find((tag) => tag.hash === headHash);
+    return matchingTag?.name ?? '';
+}
+export function resolveWakeVersion(options = {}) {
+    const repoRoot = options.repoRoot ?? defaultRepoRoot;
+    const gitOutput = options.gitOutput ?? ((args) => gitOutputFromRoot(repoRoot, args));
+    const readTextFile = options.readTextFile ?? defaultReadTextFile;
+    const listTextFiles = options.listTextFiles ?? defaultListTextFiles;
+    const exactTag = gitOutput(['describe', '--tags', '--exact-match', 'HEAD']);
+    if (exactTag.length > 0) {
+        return exactTag;
+    }
+    const exactFileTag = exactTagFromGitFiles(repoRoot, readTextFile, listTextFiles);
+    if (exactFileTag.length > 0) {
+        return exactFileTag;
+    }
+    const latestTag = gitOutput(['describe', '--tags', '--abbrev=0']);
+    const shortHash = gitOutput(['rev-parse', '--short', 'HEAD']);
+    if (latestTag.length > 0 && shortHash.length > 0) {
+        return `${latestTag}+g${shortHash}`;
+    }
+    if (shortHash.length > 0) {
+        return `g${shortHash}`;
+    }
+    const headHash = currentHeadHash(repoRoot, readTextFile);
+    if (headHash.length > 0) {
+        return `g${headHash.slice(0, 7)}`;
+    }
+    return '0.1.0-dev';
+}
+export const wakeVersion = "g743a5ea";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atolis-hq/wake",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "Local autonomous agent control plane for software development",
   "license": "Apache-2.0",
   "repository": {