@angelmsger/fx 0.10.1 → 0.12.0

package/dist/application/{workspace-context.js → workspace/context.js}

@@ -1,10 +1,10 @@
 // Resolve a registry identity, shared declarations and personal layer before workspace use.
 import path from 'node:path';
-import { describeManifestRepo } from '../domain/manifest/source-repo.js';
-import { loadManifestContext } from './manifest/context.js';
-import { assertWorkspacePrepared, contextualWorkspaceError } from './workspace/health.js';
-import { resolveWorkspace } from './workspace/resolve.js';
-import { validateWorkspaceLayer } from './workspace/validate-layer.js';
+import { describeManifestRepo } from '../../domain/manifest/source-repo.js';
+import { loadManifestContext } from '../manifest/context.js';
+import { assertWorkspacePrepared, contextualWorkspaceError } from './health.js';
+import { resolveWorkspace } from './resolve.js';
+import { validateWorkspaceLayer } from './validate-layer.js';
 export class WorkspaceContext {
     root;
     name;
@@ -16,24 +16,24 @@ export class WorkspaceContext {
     providers;
     bindings;
     platforms;
-    constructor(root, name, context, local, workspace, selection) {
-        this.root = root;
-        this.name = name;
-        this.context = context;
-        this.local = local;
-        this.workspace = workspace;
-        this.selection = selection;
-        this.manifest = context.bundle;
-        this.providers = context.providers;
-        this.bindings = context.bindings;
-        this.platforms = context.platforms;
+    constructor(input) {
+        this.root = input.root;
+        this.name = input.name;
+        this.context = input.context;
+        this.local = input.local;
+        this.workspace = input.workspace;
+        this.selection = input.selection;
+        this.manifest = input.context.bundle;
+        this.providers = input.context.providers;
+        this.bindings = input.context.bindings;
+        this.platforms = input.context.platforms;
     }
     get manifestDir() {
         return this.context.dir;
     }
     static async preview(root, name, context, local, fs) {
         const workspace = await validateWorkspaceLayer(fs, root, context.bundle.workspace.result.doc, local);
-        return new WorkspaceContext(root, name, context, local, workspace, 'explicit');
+        return new WorkspaceContext({ root, name, context, local, workspace, selection: 'explicit' });
     }
     static async locate(input) {
         const located = await resolveWorkspace(input);
@@ -44,7 +44,14 @@ export class WorkspaceContext {
         const local = await input.localStore.read(located.name);
         const workspace = await validateWorkspaceLayer(input.fs, located.root, context.bundle.workspace.result.doc, local, await manifestRepoOf(input, located));
         reportUnmatched(input.reporter, workspace);
-        return new WorkspaceContext(located.root, located.name, context, local, workspace, located.selection);
+        return new WorkspaceContext({
+            root: located.root,
+            name: located.name,
+            context,
+            local,
+            workspace,
+            selection: located.selection,
+        });
     }
 }
 // The manifest checkout is a repository of the workspace when the source is
@@ -68,4 +75,4 @@ function reportUnmatched(reporter, workspace) {
         data: { unmatched: workspace.unmatched },
     });
 }
-//# sourceMappingURL=workspace-context.js.map
+//# sourceMappingURL=context.js.map

package/dist/application/workspace/context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/application/workspace/context.ts"],"names":[],"mappings":"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"}

package/dist/application/workspace/deps.js

@@ -1,6 +1,6 @@
 // Everything a workspace use case can touch, in one object: the located
-// workspace and the ports. The code host is a thunk because most commands
-// never need it, and resolving it may fail for a workspace that has not
-// bound one yet.
+// workspace, the ports, and how this invocation answers a manifest-supplied
+// command. The code host is a thunk because most commands never need it, and
+// resolving it may fail for a workspace that has not bound one yet.
 export {};
 //# sourceMappingURL=deps.js.map

package/dist/application/workspace/deps.js.map

@@ -1 +1 @@
-{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../../src/application/workspace/deps.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,0EAA0E;AAC1E,wEAAwE;AACxE,iBAAiB"}
+{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../../src/application/workspace/deps.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,4EAA4E;AAC5E,6EAA6E;AAC7E,oEAAoE"}

package/dist/application/workspace/go-work.js

@@ -0,0 +1,77 @@
+// Keep the root go.work in step with the Go modules checked out in the workspace,
+// when the manifest asks for one. A selected repository counts once its checkout
+// has a go.mod, so the file never names a module that is missing. Only a go.work
+// fx wrote is replaced or removed; a person's own is reported and left alone.
+import path from 'node:path';
+import { DevkitError, withPartialResult } from '../../domain/errors.js';
+import { GO_WORK, goDirective, isDerivedGoWork, renderGoWork, } from '../../domain/workspace/go-work.js';
+import { assertWritable } from '../safety/posture.js';
+import { checkoutDir } from './inspect.js';
+export function goWorkspaceEnabled(deps) {
+    return deps.ctx.manifest.workspace.result.doc.go?.workspace === true;
+}
+export async function syncGoWork(deps, input) {
+    const { ctx, projections, reporter } = deps;
+    const enabled = goWorkspaceEnabled(deps);
+    const modules = enabled ? await checkedOutModules(deps) : [];
+    const text = renderGoWork(modules);
+    const at = { root: ctx.root, relative: GO_WORK };
+    const before = await projections.read(at);
+    const action = actionFor(before, text, enabled);
+    if (action === undefined)
+        return { enabled, modules, file: null };
+    const file = {
+        path: path.join(ctx.root, GO_WORK),
+        action,
+        result: ['unchanged', 'foreign'].includes(action) ? 'skipped' : 'planned',
+    };
+    if (action === 'foreign')
+        reporter.notice({
+            code: 'GO_WORK_FOREIGN',
+            message: `${file.path} was not written by fx and left alone`,
+            nextSteps: ['Move the file aside if fx should keep it, then `fx sync --only go`.'],
+        });
+    if (input.dryRun || file.result !== 'planned')
+        return { enabled, modules, file };
+    assertWritable(input.posture, 'go.work');
+    const written = await projections.write({ ...at, before, text });
+    if (written === 'conflict' || written === 'busy')
+        throw withPartialResult(new DevkitError('conflict', 'GO_WORK_WRITE_CONFLICT', `${file.path} changed during sync`, {
+            hint: 'A concurrent edit or a non-regular path is preserved.',
+            nextSteps: ['Inspect the reported path, then run `fx sync --only go` again.'],
+        }), { enabled, modules, file: { ...file, result: 'skipped' } });
+    return {
+        enabled,
+        modules,
+        file: { ...file, result: written === 'written' ? 'done' : 'skipped' },
+    };
+}
+function actionFor(before, next, enabled) {
+    const owned = before.kind === 'file' && before.text !== null && isDerivedGoWork(before.text);
+    if (!owned) {
+        if (before.kind !== 'absent')
+            return enabled ? 'foreign' : undefined;
+        return next === null ? undefined : 'created';
+    }
+    if (next === null)
+        return 'removed';
+    return before.text === next ? 'unchanged' : 'updated';
+}
+// Checkouts outside the root, such as the manifest source, stay out: a go.work
+// names its modules relative to itself.
+async function checkedOutModules(deps) {
+    const modules = [];
+    for (const repo of deps.ctx.workspace.repos) {
+        const dir = checkoutDir(deps, repo);
+        const relative = path.relative(deps.ctx.root, dir);
+        const outside = relative === '..' || relative.startsWith(`..${path.sep}`);
+        if (relative === '' || outside || path.isAbsolute(relative))
+            continue;
+        const goMod = await deps.fs.readText(path.join(dir, 'go.mod'));
+        if (goMod === undefined)
+            continue;
+        modules.push({ path: relative.split(path.sep).join('/'), go: goDirective(goMod) });
+    }
+    return modules;
+}
+//# sourceMappingURL=go-work.js.map

package/dist/application/workspace/go-work.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"go-work.js","sourceRoot":"","sources":["../../../src/application/workspace/go-work.ts"],"names":[],"mappings":"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"}

package/dist/application/workspace/guidance.js

@@ -1,6 +1,6 @@
 // Workspace recovery commands retain the resolved identity instead of resolving cwd or defaults again.
 import { DevkitError } from '../../domain/errors.js';
-import { nearest } from '../../domain/fuzzy.js';
+import { nearest, suggestionHint } from '../../domain/fuzzy.js';
 import { shellLine } from '../../domain/shell.js';
 export function recoveryCommand(context, ...args) {
     const scope = context.workspace === undefined ? [] : ['--workspace', context.workspace];
@@ -15,9 +15,7 @@ export function workspaceItemNotFound(context, input) {
     const qualifier = input.shared ? 'shared ' : '';
     const article = input.kind === 'env' ? 'an' : 'a';
     return new DevkitError('not_found', input.kind === 'repo' ? 'REPO_NOT_FOUND' : 'ENV_NOT_FOUND', `"${input.name}" is not ${article} ${qualifier}${subject} of workspace "${context.ctx.name}"`, {
-        hint: suggestion === undefined
-            ? `Known: ${input.known.join(', ') || '(none)'}.`
-            : `Did you mean "${suggestion}"?`,
+        hint: suggestionHint(suggestion, `Known: ${input.known.join(', ') || '(none)'}.`),
         nextSteps: [workspaceCommand(context, input.kind, 'list')],
     });
 }

package/dist/application/workspace/guidance.js.map

@@ -1 +1 @@
-{"version":3,"file":"guidance.js","sourceRoot":"","sources":["../../../src/application/workspace/guidance.ts"],"names":[],"mappings":"AAAA,uGAAuG;AAEvG,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAsB,MAAM,uBAAuB,CAAC;AAYtE,MAAM,UAAU,eAAe,CAAC,OAAwB,EAAE,GAAG,IAAuB;IAClF,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxF,OAAO,SAAS,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAA0B,EAAE,GAAG,IAAuB;IACrF,OAAO,eAAe,CACpB,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,EACnE,GAAG,IAAI,CACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAA0B,EAC1B,KAKC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC;IACrE,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IAClD,OAAO,IAAI,WAAW,CACpB,WAAW,EACX,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,eAAe,EAC1D,IAAI,KAAK,CAAC,IAAI,YAAY,OAAO,IAAI,SAAS,GAAG,OAAO,kBAAkB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,EAC7F;QACE,IAAI,EACF,UAAU,KAAK,SAAS;YACtB,CAAC,CAAC,UAAU,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG;YACjD,CAAC,CAAC,iBAAiB,UAAU,IAAI;QACrC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC3D,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"guidance.js","sourceRoot":"","sources":["../../../src/application/workspace/guidance.ts"],"names":[],"mappings":"AAAA,uGAAuG;AAEvG,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAsB,MAAM,uBAAuB,CAAC;AAYtE,MAAM,UAAU,eAAe,CAAC,OAAwB,EAAE,GAAG,IAAuB;IAClF,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxF,OAAO,SAAS,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAA0B,EAAE,GAAG,IAAuB;IACrF,OAAO,eAAe,CACpB,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,EACnE,GAAG,IAAI,CACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAA0B,EAC1B,KAKC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC;IACrE,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IAClD,OAAO,IAAI,WAAW,CACpB,WAAW,EACX,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,eAAe,EAC1D,IAAI,KAAK,CAAC,IAAI,YAAY,OAAO,IAAI,SAAS,GAAG,OAAO,kBAAkB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,EAC7F;QACE,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,UAAU,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG,CAAC;QACjF,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC3D,CACF,CAAC;AACJ,CAAC"}

package/dist/application/workspace/health.js

@@ -3,11 +3,12 @@ import path from 'node:path';
 import { asDevkitError, DevkitError, toEnvelope } from '../../domain/errors.js';
 import { MANIFEST_FILES } from '../../domain/manifest/files.js';
 import { shellLine } from '../../domain/shell.js';
+import { operationJournalPath } from '../../domain/workspace/operation-journal.js';
 import { LoadManifest } from '../manifest/load.js';
 export async function workspaceReadiness(input, located) {
     try {
         await assertWorkspacePrepared(input, located);
-        await new LoadManifest(input.fs, input.bundledTools).execute({
+        await new LoadManifest({ fs: input.fs, bundledTools: input.bundledTools }).execute({
             dir: located.manifestDir,
             cliVersion: input.cliVersion,
             providers: input.providers,
@@ -64,7 +65,8 @@ export function contextualWorkspaceError(input, located, error) {
     });
 }
 export async function assertNoWorkspaceOperation(input, located) {
-    const file = path.join(path.dirname(located.manifestDir), 'workspace-operation.json');
+    // Callers hold the manifest source, which lies beside the journal in the workspace's directory.
+    const file = operationJournalPath(path.dirname(located.manifestDir));
     if (!(await input.fs.exists(file)))
         return;
     throw new DevkitError('conflict', 'WORKSPACE_OPERATION_PENDING', `Workspace "${located.name}" has an unfinished identity operation`, {

package/dist/application/workspace/health.js.map

@@ -1 +1 @@
-{"version":3,"file":"health.js","sourceRoot":"","sources":["../../../src/application/workspace/health.ts"],"names":[],"mappings":"AAAA,oFAAoF;AAEpF,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAsB,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAenD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC;QACH,MAAM,uBAAuB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YAC3D,GAAG,EAAE,OAAO,CAAC,WAAW;YACxB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B,CAAC,CAAC;QACH,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC3D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAChE,MAAM,QAAQ,GAA8C;YAC1D,sBAAsB,EAAE,cAAc;YACtC,mBAAmB,EAAE,YAAY;YACjC,gBAAgB,EAAE,SAAS;SAC5B,CAAC;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC;QACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;IAC3E,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,KAA0D,EAC1D,OAAgB,EAChB,gBAAgB,GAAG,KAAK;IAExB,MAAM,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,CAAC,GAAG,IAAc,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IACtF,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,IAAI,WAAW,CACnB,WAAW,EACX,wBAAwB,EACxB,cAAc,OAAO,CAAC,IAAI,sBAAsB,OAAO,CAAC,IAAI,EAAE,EAC9D;YACE,IAAI,EAAE,kJAAkJ;YACxJ,SAAS,EAAE;gBACT,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC;gBAC1C,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,sBAAsB,CAAC;aACvE;SACF,CACF,CAAC;IACJ,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;QAAE,OAAO;IAC5F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAC9E,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,qBAAqB,EACrD,cAAc,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,gCAAgC,EAAE,EACnH;QACE,IAAI,EAAE,qHAAqH;QAC3H,SAAS,EAAE;YACT,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,UAAU,CAAC;YACrF,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC;SAC3C;KACF,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,KAAwC,EACxC,OAAgB,EAChB,KAAc;IAEd,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACrC,IACE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QACrC,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;QAElE,OAAO,OAAO,CAAC;IACjB,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE;QACtE,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,SAAS,EAAE;YACT,SAAS,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;YAC1F,SAAS,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;SACzE;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,KAA+C,EAC/C,OAA8C;IAE9C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,0BAA0B,CAAC,CAAC;IACtF,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO;IAC3C,MAAM,IAAI,WAAW,CACnB,UAAU,EACV,6BAA6B,EAC7B,cAAc,OAAO,CAAC,IAAI,wCAAwC,EAClE;QACE,IAAI,EAAE,WAAW,IAAI,0GAA0G;QAC/H,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;KACtF,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"health.js","sourceRoot":"","sources":["../../../src/application/workspace/health.ts"],"names":[],"mappings":"AAAA,oFAAoF;AAEpF,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAsB,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAenD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC;QACH,MAAM,uBAAuB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,IAAI,YAAY,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC;YACjF,GAAG,EAAE,OAAO,CAAC,WAAW;YACxB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B,CAAC,CAAC;QACH,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC3D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAChE,MAAM,QAAQ,GAA8C;YAC1D,sBAAsB,EAAE,cAAc;YACtC,mBAAmB,EAAE,YAAY;YACjC,gBAAgB,EAAE,SAAS;SAC5B,CAAC;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC;QACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;IAC3E,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,KAA0D,EAC1D,OAAgB,EAChB,gBAAgB,GAAG,KAAK;IAExB,MAAM,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,CAAC,GAAG,IAAc,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IACtF,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,IAAI,WAAW,CACnB,WAAW,EACX,wBAAwB,EACxB,cAAc,OAAO,CAAC,IAAI,sBAAsB,OAAO,CAAC,IAAI,EAAE,EAC9D;YACE,IAAI,EAAE,kJAAkJ;YACxJ,SAAS,EAAE;gBACT,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC;gBAC1C,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,sBAAsB,CAAC;aACvE;SACF,CACF,CAAC;IACJ,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;QAAE,OAAO;IAC5F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAC9E,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,qBAAqB,EACrD,cAAc,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,gCAAgC,EAAE,EACnH;QACE,IAAI,EAAE,qHAAqH;QAC3H,SAAS,EAAE;YACT,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,UAAU,CAAC;YACrF,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC;SAC3C;KACF,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,KAAwC,EACxC,OAAgB,EAChB,KAAc;IAEd,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACrC,IACE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QACrC,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;QAElE,OAAO,OAAO,CAAC;IACjB,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE;QACtE,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,SAAS,EAAE;YACT,SAAS,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;YAC1F,SAAS,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;SACzE;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,KAA+C,EAC/C,OAA8C;IAE9C,gGAAgG;IAChG,MAAM,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IACrE,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO;IAC3C,MAAM,IAAI,WAAW,CACnB,UAAU,EACV,6BAA6B,EAC7B,cAAc,OAAO,CAAC,IAAI,wCAAwC,EAClE;QACE,IAAI,EAAE,WAAW,IAAI,0GAA0G;QAC/H,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;KACtF,CACF,CAAC;AACJ,CAAC"}

package/dist/application/workspace/inspect.js

@@ -2,7 +2,6 @@
 import path from 'node:path';
 import { DevkitError } from '../../domain/errors.js';
 import { resolveSharedRepo } from '../../domain/manifest/local.js';
-import { samePath } from '../../domain/path.js';
 import { repoRef } from '../../domain/workspace/ref.js';
 import { workspaceCommand, workspaceItemNotFound } from './guidance.js';
 export function checkoutDir(deps, repo) {
@@ -12,9 +11,7 @@ export async function inspectDisk(deps, repo) {
     const dir = checkoutDir(deps, repo);
     if (!(await deps.fs.exists(dir)))
         return { kind: 'absent' };
-    const top = await deps.git.toplevel(dir);
-    // git reports resolved paths; a workspace under /tmp or /var is reached through a symlink.
-    if (top === undefined || !samePath(await deps.fs.realpath(top), await deps.fs.realpath(dir)))
+    if (!(await deps.git.isToplevel(dir)))
         return { kind: 'not_git' };
     const compareTo = repo.branch === undefined ? undefined : `upstream/${repo.branch}`;
     const [state, remotes] = await Promise.all([

package/dist/application/workspace/inspect.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../../src/application/workspace/inspect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../../src/application/workspace/inspect.ts"],"names":[],"mappings":"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"}