@agentxm/client-core 0.11.0 → 0.11.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/unstable/agent-capabilities/catalog.generated.d.ts +429 -0
- package/dist/src/unstable/agent-capabilities/catalog.generated.d.ts.map +1 -0
- package/dist/src/unstable/agent-capabilities/catalog.generated.js +474 -0
- package/dist/src/unstable/agent-capabilities/catalog.generated.js.map +1 -0
- package/dist/src/unstable/agent-capabilities/derive.d.ts +121 -0
- package/dist/src/unstable/agent-capabilities/derive.d.ts.map +1 -0
- package/dist/src/unstable/agent-capabilities/derive.js +72 -0
- package/dist/src/unstable/agent-capabilities/derive.js.map +1 -0
- package/dist/src/unstable/agent-capabilities/index.d.ts +13 -0
- package/dist/src/unstable/agent-capabilities/index.d.ts.map +1 -0
- package/dist/src/unstable/agent-capabilities/index.js +13 -0
- package/dist/src/unstable/agent-capabilities/index.js.map +1 -0
- package/dist/src/unstable/agent-capabilities/lookup.d.ts +10 -0
- package/dist/src/unstable/agent-capabilities/lookup.d.ts.map +1 -0
- package/dist/src/unstable/agent-capabilities/lookup.js +9 -0
- package/dist/src/unstable/agent-capabilities/lookup.js.map +1 -0
- package/dist/src/unstable/agent-capabilities/schema.d.ts +254 -0
- package/dist/src/unstable/agent-capabilities/schema.d.ts.map +1 -0
- package/dist/src/unstable/agent-capabilities/schema.js +178 -0
- package/dist/src/unstable/agent-capabilities/schema.js.map +1 -0
- package/dist/src/unstable/agent-capabilities/standards.d.ts +24 -0
- package/dist/src/unstable/agent-capabilities/standards.d.ts.map +1 -0
- package/dist/src/unstable/agent-capabilities/standards.js +24 -0
- package/dist/src/unstable/agent-capabilities/standards.js.map +1 -0
- package/dist/src/unstable/agent-capabilities/validate.d.ts +19 -0
- package/dist/src/unstable/agent-capabilities/validate.d.ts.map +1 -0
- package/dist/src/unstable/agent-capabilities/validate.js +107 -0
- package/dist/src/unstable/agent-capabilities/validate.js.map +1 -0
- package/dist/src/unstable/agents/detection.d.ts +4 -4
- package/dist/src/unstable/auth/credential-store.d.ts +1 -1
- package/dist/src/unstable/auth/guard-interaction.d.ts +1 -1
- package/dist/src/unstable/commands/manager.d.ts +3 -2
- package/dist/src/unstable/commands/manager.d.ts.map +1 -1
- package/dist/src/unstable/commands/manager.js +34 -19
- package/dist/src/unstable/commands/manager.js.map +1 -1
- package/dist/src/unstable/commands/operations/disable.d.ts.map +1 -1
- package/dist/src/unstable/commands/operations/disable.js +4 -1
- package/dist/src/unstable/commands/operations/disable.js.map +1 -1
- package/dist/src/unstable/commands/operations/install.d.ts.map +1 -1
- package/dist/src/unstable/commands/operations/install.js +12 -2
- package/dist/src/unstable/commands/operations/install.js.map +1 -1
- package/dist/src/unstable/commands/operations/shared-command-helpers.d.ts +5 -5
- package/dist/src/unstable/commands/operations/shared-command-helpers.d.ts.map +1 -1
- package/dist/src/unstable/commands/operations/shared-command-helpers.js +14 -1
- package/dist/src/unstable/commands/operations/shared-command-helpers.js.map +1 -1
- package/dist/src/unstable/commands/operations/uninstall.d.ts.map +1 -1
- package/dist/src/unstable/commands/operations/uninstall.js +3 -1
- package/dist/src/unstable/commands/operations/uninstall.js.map +1 -1
- package/dist/src/unstable/commands/paths.d.ts +4 -3
- package/dist/src/unstable/commands/paths.d.ts.map +1 -1
- package/dist/src/unstable/commands/paths.js +10 -3
- package/dist/src/unstable/commands/paths.js.map +1 -1
- package/dist/src/unstable/commands/renderers/render-markdown-only.d.ts.map +1 -1
- package/dist/src/unstable/commands/renderers/render-markdown-only.js +8 -1
- package/dist/src/unstable/commands/renderers/render-markdown-only.js.map +1 -1
- package/dist/src/unstable/commands/renderers/render-markdown-with-frontmatter.d.ts.map +1 -1
- package/dist/src/unstable/commands/renderers/render-markdown-with-frontmatter.js +8 -1
- package/dist/src/unstable/commands/renderers/render-markdown-with-frontmatter.js.map +1 -1
- package/dist/src/unstable/commands/renderers/render-plain-text.d.ts.map +1 -1
- package/dist/src/unstable/commands/renderers/render-plain-text.js +8 -1
- package/dist/src/unstable/commands/renderers/render-plain-text.js.map +1 -1
- package/dist/src/unstable/commands/renderers/render-prompt-md.d.ts.map +1 -1
- package/dist/src/unstable/commands/renderers/render-prompt-md.js +8 -1
- package/dist/src/unstable/commands/renderers/render-prompt-md.js.map +1 -1
- package/dist/src/unstable/commands/renderers/render-toml.d.ts.map +1 -1
- package/dist/src/unstable/commands/renderers/render-toml.js +2 -1
- package/dist/src/unstable/commands/renderers/render-toml.js.map +1 -1
- package/dist/src/unstable/commands/renderers/types.d.ts +2 -1
- package/dist/src/unstable/commands/renderers/types.d.ts.map +1 -1
- package/dist/src/unstable/commands/renderers/types.js.map +1 -1
- package/dist/src/unstable/discover/discover.d.ts +1 -1
- package/dist/src/unstable/extensions/rendered-files.d.ts +6 -3
- package/dist/src/unstable/extensions/rendered-files.d.ts.map +1 -1
- package/dist/src/unstable/extensions/rendered-files.js +6 -2
- package/dist/src/unstable/extensions/rendered-files.js.map +1 -1
- package/dist/src/unstable/install-meta/install-meta.d.ts +4 -4
- package/dist/src/unstable/install-method/install-method.d.ts +3 -3
- package/dist/src/unstable/lint/catalog/workspace-read-model/lint-workspace.d.ts.map +1 -1
- package/dist/src/unstable/lint/catalog/workspace-read-model/lint-workspace.js +4 -3
- package/dist/src/unstable/lint/catalog/workspace-read-model/lint-workspace.js.map +1 -1
- package/dist/src/unstable/lockfile/lockfile.d.ts +1 -1
- package/dist/src/unstable/lockfile/schema.d.ts +63 -63
- package/dist/src/unstable/lockfile/schema.d.ts.map +1 -1
- package/dist/src/unstable/lockfile/schema.js +7 -1
- package/dist/src/unstable/lockfile/schema.js.map +1 -1
- package/dist/src/unstable/mcp-servers/manager.d.ts +1 -1
- package/dist/src/unstable/package-urls/companion-package.d.ts.map +1 -1
- package/dist/src/unstable/package-urls/companion-package.js +7 -4
- package/dist/src/unstable/package-urls/companion-package.js.map +1 -1
- package/dist/src/unstable/package-urls/companion-package.spec.js +39 -0
- package/dist/src/unstable/package-urls/companion-package.spec.js.map +1 -1
- package/dist/src/unstable/package-urls/internal.d.ts.map +1 -1
- package/dist/src/unstable/package-urls/internal.js +6 -3
- package/dist/src/unstable/package-urls/internal.js.map +1 -1
- package/dist/src/unstable/package-urls/vers-range.d.ts +2 -0
- package/dist/src/unstable/package-urls/vers-range.d.ts.map +1 -1
- package/dist/src/unstable/package-urls/vers-range.js +2 -2
- package/dist/src/unstable/package-urls/vers-range.js.map +1 -1
- package/dist/src/unstable/packaging/detect.d.ts +1 -1
- package/dist/src/unstable/packaging/jsr.d.ts +1 -1
- package/dist/src/unstable/packaging/jsr.d.ts.map +1 -1
- package/dist/src/unstable/packaging/jsr.js +4 -11
- package/dist/src/unstable/packaging/jsr.js.map +1 -1
- package/dist/src/unstable/packaging/mojo.d.ts +1 -1
- package/dist/src/unstable/packaging/mojo.js +4 -4
- package/dist/src/unstable/packaging/mojo.js.map +1 -1
- package/dist/src/unstable/packaging/read.d.ts +1 -1
- package/dist/src/unstable/packaging/zig.d.ts +1 -1
- package/dist/src/unstable/packaging/zig.js +3 -3
- package/dist/src/unstable/packaging/zig.js.map +1 -1
- package/dist/src/unstable/packs/manager.d.ts +1 -1
- package/dist/src/unstable/packs/paths.d.ts +2 -1
- package/dist/src/unstable/packs/paths.d.ts.map +1 -1
- package/dist/src/unstable/packs/paths.js +2 -1
- package/dist/src/unstable/packs/paths.js.map +1 -1
- package/dist/src/unstable/plan/resolve-plan.d.ts +1 -1
- package/dist/src/unstable/plan/resolve-plan.d.ts.map +1 -1
- package/dist/src/unstable/plan/resolve-plan.js +4 -3
- package/dist/src/unstable/plan/resolve-plan.js.map +1 -1
- package/dist/src/unstable/registry/client.d.ts +1 -1
- package/dist/src/unstable/registry/utils.d.ts +1 -1
- package/dist/src/unstable/settings/settings.d.ts +1 -1
- package/dist/src/unstable/skills/manager.d.ts +1 -1
- package/dist/src/unstable/skills/manager.d.ts.map +1 -1
- package/dist/src/unstable/skills/manager.js +32 -21
- package/dist/src/unstable/skills/manager.js.map +1 -1
- package/dist/src/unstable/skills/operations/disable.d.ts.map +1 -1
- package/dist/src/unstable/skills/operations/disable.js +3 -1
- package/dist/src/unstable/skills/operations/disable.js.map +1 -1
- package/dist/src/unstable/skills/operations/install.d.ts +1 -1
- package/dist/src/unstable/skills/operations/install.d.ts.map +1 -1
- package/dist/src/unstable/skills/operations/install.js +16 -4
- package/dist/src/unstable/skills/operations/install.js.map +1 -1
- package/dist/src/unstable/skills/operations/source-hash.d.ts +1 -1
- package/dist/src/unstable/skills/operations/uninstall.d.ts.map +1 -1
- package/dist/src/unstable/skills/operations/uninstall.js +3 -1
- package/dist/src/unstable/skills/operations/uninstall.js.map +1 -1
- package/dist/src/unstable/skills/paths.d.ts +3 -2
- package/dist/src/unstable/skills/paths.d.ts.map +1 -1
- package/dist/src/unstable/skills/paths.js +9 -2
- package/dist/src/unstable/skills/paths.js.map +1 -1
- package/dist/src/unstable/source-resolution/providers/git-hosting.d.ts +4 -4
- package/dist/src/unstable/source-resolution/providers/registry/host-provider.d.ts +1 -1
- package/dist/src/unstable/source-resolution/resolve-identifier.d.ts +1 -1
- package/dist/src/unstable/source-resolution/resolve-source.d.ts +1 -1
- package/dist/src/unstable/source-resolution/service.d.ts +2 -2
- package/dist/src/unstable/sources/lock-entry-to-ref.d.ts +2 -0
- package/dist/src/unstable/sources/lock-entry-to-ref.d.ts.map +1 -1
- package/dist/src/unstable/sources/lock-entry-to-ref.js +21 -12
- package/dist/src/unstable/sources/lock-entry-to-ref.js.map +1 -1
- package/dist/src/unstable/sources/source-to-lock-entry.d.ts +2 -0
- package/dist/src/unstable/sources/source-to-lock-entry.d.ts.map +1 -1
- package/dist/src/unstable/sources/source-to-lock-entry.js +2 -1
- package/dist/src/unstable/sources/source-to-lock-entry.js.map +1 -1
- package/dist/src/unstable/subagents/lock-entry-builder.d.ts +2 -1
- package/dist/src/unstable/subagents/lock-entry-builder.d.ts.map +1 -1
- package/dist/src/unstable/subagents/lock-entry-builder.js +3 -2
- package/dist/src/unstable/subagents/lock-entry-builder.js.map +1 -1
- package/dist/src/unstable/subagents/manager.d.ts +1 -1
- package/dist/src/unstable/subagents/manager.d.ts.map +1 -1
- package/dist/src/unstable/subagents/manager.js +29 -15
- package/dist/src/unstable/subagents/manager.js.map +1 -1
- package/dist/src/unstable/subagents/operations/enable.d.ts.map +1 -1
- package/dist/src/unstable/subagents/operations/enable.js +16 -6
- package/dist/src/unstable/subagents/operations/enable.js.map +1 -1
- package/dist/src/unstable/subagents/paths.d.ts +4 -3
- package/dist/src/unstable/subagents/paths.d.ts.map +1 -1
- package/dist/src/unstable/subagents/paths.js +10 -3
- package/dist/src/unstable/subagents/paths.js.map +1 -1
- package/dist/src/unstable/subagents/rendering/adapters/json.d.ts.map +1 -1
- package/dist/src/unstable/subagents/rendering/adapters/json.js +2 -3
- package/dist/src/unstable/subagents/rendering/adapters/json.js.map +1 -1
- package/dist/src/unstable/subagents/rendering/adapters/markdown-yaml.d.ts.map +1 -1
- package/dist/src/unstable/subagents/rendering/adapters/markdown-yaml.js +2 -3
- package/dist/src/unstable/subagents/rendering/adapters/markdown-yaml.js.map +1 -1
- package/dist/src/unstable/subagents/rendering/adapters/toml.d.ts.map +1 -1
- package/dist/src/unstable/subagents/rendering/adapters/toml.js +2 -3
- package/dist/src/unstable/subagents/rendering/adapters/toml.js.map +1 -1
- package/dist/src/unstable/subagents/rendering/types.d.ts +2 -2
- package/dist/src/unstable/subagents/rendering/types.d.ts.map +1 -1
- package/dist/src/unstable/update-check/update-check.d.ts +3 -3
- package/dist/src/unstable/utils/build-zip-archive.d.ts +1 -1
- package/dist/src/unstable/utils/create-symlink.d.ts +1 -1
- package/dist/src/unstable/utils/index.d.ts +2 -1
- package/dist/src/unstable/utils/index.d.ts.map +1 -1
- package/dist/src/unstable/utils/index.js +2 -1
- package/dist/src/unstable/utils/index.js.map +1 -1
- package/dist/src/unstable/utils/path-safety.d.ts +12 -0
- package/dist/src/unstable/utils/path-safety.d.ts.map +1 -1
- package/dist/src/unstable/utils/path-safety.js +18 -0
- package/dist/src/unstable/utils/path-safety.js.map +1 -1
- package/dist/src/unstable/utils/path-types.d.ts +22 -0
- package/dist/src/unstable/utils/path-types.d.ts.map +1 -0
- package/dist/src/unstable/utils/path-types.js +48 -0
- package/dist/src/unstable/utils/path-types.js.map +1 -0
- package/dist/src/unstable/workflows/install-command/workflow.d.ts +1 -1
- package/dist/src/unstable/workflows/uninstall-command/workflow.d.ts +1 -1
- package/dist/src/unstable/workspace/configured-entry-resolution/resolve.d.ts +5 -5
- package/dist/src/unstable/workspace/initialization-interaction.d.ts +1 -1
- package/dist/src/unstable/workspace/initialization.d.ts +28 -28
- package/dist/src/unstable/workspace/initialization.d.ts.map +1 -1
- package/dist/src/unstable/workspace/initialization.js +7 -10
- package/dist/src/unstable/workspace/initialization.js.map +1 -1
- package/dist/src/unstable/workspace/paths.d.ts +6 -5
- package/dist/src/unstable/workspace/paths.d.ts.map +1 -1
- package/dist/src/unstable/workspace/paths.js +4 -3
- package/dist/src/unstable/workspace/paths.js.map +1 -1
- package/dist/src/unstable/workspace/read-model/__fixtures__/occurrences.d.ts.map +1 -1
- package/dist/src/unstable/workspace/read-model/__fixtures__/occurrences.js +13 -8
- package/dist/src/unstable/workspace/read-model/__fixtures__/occurrences.js.map +1 -1
- package/dist/src/unstable/workspace/read-model/__fixtures__/test-layer.d.ts.map +1 -1
- package/dist/src/unstable/workspace/read-model/__fixtures__/test-layer.js +4 -3
- package/dist/src/unstable/workspace/read-model/__fixtures__/test-layer.js.map +1 -1
- package/dist/src/unstable/workspace/read-model/discovery/subagents.d.ts +2 -2
- package/dist/src/unstable/workspace/read-model/scanners/agent-dir.d.ts.map +1 -1
- package/dist/src/unstable/workspace/read-model/scanners/agent-dir.js +7 -4
- package/dist/src/unstable/workspace/read-model/scanners/agent-dir.js.map +1 -1
- package/dist/src/unstable/workspace/read-model/scanners/agent-settings.d.ts.map +1 -1
- package/dist/src/unstable/workspace/read-model/scanners/agent-settings.js +2 -1
- package/dist/src/unstable/workspace/read-model/scanners/agent-settings.js.map +1 -1
- package/dist/src/unstable/workspace/read-model/scanners/canonical-extensions.d.ts.map +1 -1
- package/dist/src/unstable/workspace/read-model/scanners/canonical-extensions.js +4 -2
- package/dist/src/unstable/workspace/read-model/scanners/canonical-extensions.js.map +1 -1
- package/dist/src/unstable/workspace/read-model/scanners/mcp-config.d.ts.map +1 -1
- package/dist/src/unstable/workspace/read-model/scanners/mcp-config.js +5 -2
- package/dist/src/unstable/workspace/read-model/scanners/mcp-config.js.map +1 -1
- package/dist/src/unstable/workspace/read-model/scanners/types.d.ts +8 -7
- package/dist/src/unstable/workspace/read-model/scanners/types.d.ts.map +1 -1
- package/dist/src/unstable/workspace/read-model/scanners/types.js.map +1 -1
- package/dist/src/unstable/workspace/read-model/service.d.ts +4 -3
- package/dist/src/unstable/workspace/read-model/service.d.ts.map +1 -1
- package/dist/src/unstable/workspace/read-model/service.js +3 -2
- package/dist/src/unstable/workspace/read-model/service.js.map +1 -1
- package/dist/src/unstable/workspace/resolve-plan-interaction.d.ts +1 -1
- package/dist/src/unstable/workspace/service.d.ts +65 -65
- package/dist/src/unstable/workspace/service.d.ts.map +1 -1
- package/dist/src/unstable/workspace/service.js +4 -3
- package/dist/src/unstable/workspace/service.js.map +1 -1
- package/dist/src/unstable/workspace/skill-snapshot.d.ts +3 -3
- package/dist/src/unstable/workspace/skill-snapshot.d.ts.map +1 -1
- package/dist/src/unstable/workspace/skill-snapshot.js +4 -3
- package/dist/src/unstable/workspace/skill-snapshot.js.map +1 -1
- package/dist/src/unstable/workspace/test-stubs.d.ts.map +1 -1
- package/dist/src/unstable/workspace/test-stubs.js +2 -1
- package/dist/src/unstable/workspace/test-stubs.js.map +1 -1
- package/package.json +6 -2
|
@@ -20,10 +20,11 @@ import { makeAppError } from "../app-error/index.js";
|
|
|
20
20
|
import { CliRenderer } from "../cli-renderer/index.js";
|
|
21
21
|
import { LOCKFILE_NAME, LOCKFILE_VERSION, writeLockfile } from "../lockfile/index.js";
|
|
22
22
|
import { createDefaultSettings, SETTINGS_FILENAME, writeSettings, } from "../settings/index.js";
|
|
23
|
+
import { makeAbsolutePath } from "../utils/path-types.js";
|
|
23
24
|
import { AgentRootResolverLive } from "./read-model/agent-root-resolver.js";
|
|
24
25
|
import { makeWorkspaceReadModel, WorkspaceReadModelConfig } from "./read-model/service.js";
|
|
25
26
|
import { WorkspaceInitializationInteraction } from "./initialization-interaction.js";
|
|
26
|
-
import { getAxmDir } from "./paths.js";
|
|
27
|
+
import { getAxmDir, locateWorkspace } from "./paths.js";
|
|
27
28
|
const SELECT_AGENTS_PROMPT_MISSING = makeAppError({
|
|
28
29
|
code: "usage",
|
|
29
30
|
detail: "Interactive prompt required: Select agents to configure",
|
|
@@ -40,9 +41,9 @@ const readSettingsFromReadModel = (scope, projectRoot, userHome) => Effect.gen(f
|
|
|
40
41
|
const path = yield* Path.Path;
|
|
41
42
|
const platformLayer = Layer.mergeAll(Layer.succeed(FileSystem.FileSystem, fs), Layer.succeed(Path.Path, path));
|
|
42
43
|
const env = Layer.mergeAll(platformLayer, Layer.succeed(WorkspaceReadModelConfig, {
|
|
43
|
-
projectRoot,
|
|
44
|
-
userHome,
|
|
45
|
-
allowedRoot: "/",
|
|
44
|
+
projectRoot: makeAbsolutePath(path, projectRoot),
|
|
45
|
+
userHome: makeAbsolutePath(path, userHome),
|
|
46
|
+
allowedRoot: makeAbsolutePath(path, "/"),
|
|
46
47
|
}), AgentRootResolverLive.pipe(Layer.provide(platformLayer)));
|
|
47
48
|
return yield* makeWorkspaceReadModel(scope).pipe(Effect.flatMap((readModel) => readModel.state.settings), Effect.provide(env), Effect.mapError((error) => makeAppError({
|
|
48
49
|
code: "validation",
|
|
@@ -167,12 +168,8 @@ export const ensureProjectWorkspaceInitialized = (localDir, options) => Effect.g
|
|
|
167
168
|
});
|
|
168
169
|
export const bootstrapWorkspace = (options) => Effect.gen(function* () {
|
|
169
170
|
const path = yield* Path.Path;
|
|
170
|
-
const
|
|
171
|
-
const
|
|
172
|
-
scope: options.scope,
|
|
173
|
-
path: workspaceDir,
|
|
174
|
-
baseDir: path.dirname(workspaceDir),
|
|
175
|
-
};
|
|
171
|
+
const location = yield* locateWorkspace(options.scope, options.projectRoot);
|
|
172
|
+
const workspaceDir = location.path;
|
|
176
173
|
if (options.scope === "user") {
|
|
177
174
|
const initialized = yield* ensureGlobalWorkspaceInitialized(workspaceDir);
|
|
178
175
|
const localDir = yield* getAxmDir("project", options.projectRoot);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialization.js","sourceRoot":"","sources":["../../../../src/unstable/workspace/initialization.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EACL,qBAAqB,GAItB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EAEjB,aAAa,GACd,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"initialization.js","sourceRoot":"","sources":["../../../../src/unstable/workspace/initialization.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,13 +9,14 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import * as Path from "effect/Path";
|
|
11
11
|
import * as Effect from "effect/Effect";
|
|
12
|
+
import { type AbsolutePath } from "../utils/path-types.js";
|
|
12
13
|
import type { WorkspaceScope } from "./scope.js";
|
|
13
14
|
export interface WorkspaceLocation {
|
|
14
15
|
readonly scope: WorkspaceScope;
|
|
15
|
-
readonly path:
|
|
16
|
-
readonly baseDir:
|
|
16
|
+
readonly path: AbsolutePath;
|
|
17
|
+
readonly baseDir: AbsolutePath;
|
|
17
18
|
}
|
|
18
|
-
export declare const getUserScopeDir: () => Effect.Effect<
|
|
19
|
+
export declare const getUserScopeDir: () => Effect.Effect<AbsolutePath, never, Path.Path>;
|
|
19
20
|
/**
|
|
20
21
|
* Returns the project-level axm directory path (./.axm).
|
|
21
22
|
*
|
|
@@ -34,7 +35,7 @@ export declare const getUserScopeDir: () => Effect.Effect<string, never, Path.Pa
|
|
|
34
35
|
* // => "/path/to/project/.axm"
|
|
35
36
|
* ```
|
|
36
37
|
*/
|
|
37
|
-
export declare const getProjectDir: (projectRoot?: string) => Effect.Effect<
|
|
38
|
+
export declare const getProjectDir: (projectRoot?: string) => Effect.Effect<AbsolutePath, never, Path.Path>;
|
|
38
39
|
/**
|
|
39
40
|
* Returns the axm directory path based on configuration scope.
|
|
40
41
|
*
|
|
@@ -59,6 +60,6 @@ export declare const getProjectDir: (projectRoot?: string) => Effect.Effect<stri
|
|
|
59
60
|
* // => "/Users/username/.axm"
|
|
60
61
|
* ```
|
|
61
62
|
*/
|
|
62
|
-
export declare const getAxmDir: (scope: WorkspaceScope, projectRoot?: string) => Effect.Effect<
|
|
63
|
+
export declare const getAxmDir: (scope: WorkspaceScope, projectRoot?: string) => Effect.Effect<AbsolutePath, never, Path.Path>;
|
|
63
64
|
export declare const locateWorkspace: (scope: WorkspaceScope, projectRoot?: string) => Effect.Effect<WorkspaceLocation, never, Path.Path>;
|
|
64
65
|
//# sourceMappingURL=paths.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../../src/unstable/workspace/paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../../src/unstable/workspace/paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;CAChC;AA6BD,eAAO,MAAM,eAAe,QAAO,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAS3E,CAAC;AAEL;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,aAAa,GACxB,cAAc,MAAM,KACnB,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAK3C,CAAC;AAEL;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,SAAS,GACpB,OAAO,cAAc,EACrB,cAAc,MAAM,KACnB,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CACoB,CAAC;AAEpE,eAAO,MAAM,eAAe,GAC1B,OAAO,cAAc,EACrB,cAAc,MAAM,KACnB,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAUhD,CAAC"}
|
|
@@ -12,6 +12,7 @@ import * as Config from "effect/Config";
|
|
|
12
12
|
import * as Path from "effect/Path";
|
|
13
13
|
import * as Effect from "effect/Effect";
|
|
14
14
|
import * as Option from "effect/Option";
|
|
15
|
+
import { makeAbsolutePath } from "../utils/path-types.js";
|
|
15
16
|
// -----------------------------------------------------------------------------
|
|
16
17
|
// Public API
|
|
17
18
|
// -----------------------------------------------------------------------------
|
|
@@ -44,7 +45,7 @@ export const getUserScopeDir = () => Effect.gen(function* () {
|
|
|
44
45
|
onNone: () => os.homedir(),
|
|
45
46
|
onSome: (value) => value,
|
|
46
47
|
});
|
|
47
|
-
return path.join(home, ".axm");
|
|
48
|
+
return makeAbsolutePath(path, path.join(home, ".axm"));
|
|
48
49
|
});
|
|
49
50
|
/**
|
|
50
51
|
* Returns the project-level axm directory path (./.axm).
|
|
@@ -67,7 +68,7 @@ export const getUserScopeDir = () => Effect.gen(function* () {
|
|
|
67
68
|
export const getProjectDir = (projectRoot) => Effect.gen(function* () {
|
|
68
69
|
const path = yield* Path.Path;
|
|
69
70
|
const baseDir = projectRoot ?? (yield* Effect.sync(() => process.cwd()));
|
|
70
|
-
return path.join(baseDir, ".axm");
|
|
71
|
+
return makeAbsolutePath(path, path.join(baseDir, ".axm"));
|
|
71
72
|
});
|
|
72
73
|
/**
|
|
73
74
|
* Returns the axm directory path based on configuration scope.
|
|
@@ -100,7 +101,7 @@ export const locateWorkspace = (scope, projectRoot) => Effect.gen(function* () {
|
|
|
100
101
|
return {
|
|
101
102
|
scope,
|
|
102
103
|
path: workspacePath,
|
|
103
|
-
baseDir: path.dirname(workspacePath),
|
|
104
|
+
baseDir: makeAbsolutePath(path, path.dirname(workspacePath)),
|
|
104
105
|
};
|
|
105
106
|
});
|
|
106
107
|
//# sourceMappingURL=paths.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../../src/unstable/workspace/paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../../src/unstable/workspace/paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAqB,MAAM,wBAAwB,CAAC;AAS7E,gFAAgF;AAChF,aAAa;AACb,gFAAgF;AAEhF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,eAAe,GAAG,GAAkD,EAAE,CACjF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE;QACtF,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE;QAC1B,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;KACzB,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC;AAEL;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,WAAoB,EAC2B,EAAE,CACjD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IAC9B,MAAM,OAAO,GAAG,WAAW,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACzE,OAAO,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;AAC5D,CAAC,CAAC,CAAC;AAEL;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,KAAqB,EACrB,WAAoB,EAC2B,EAAE,CACjD,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;AAEpE,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,KAAqB,EACrB,WAAoB,EACgC,EAAE,CACtD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IAC9B,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAE3D,OAAO;QACL,KAAK;QACL,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACjC,CAAC;AAChC,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"occurrences.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/__fixtures__/occurrences.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"occurrences.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/__fixtures__/occurrences.ts"],"names":[],"mappings":"AAeA,OAAO,EAA2B,KAAK,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,uBAAuB,EACvB,4BAA4B,EAC5B,4BAA4B,EAC5B,4BAA4B,EAC7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAyDzC,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,4BAA4B,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CACtC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,GAClC,OAAO,4BAA4B,KAClC,4BAoBF,CAAC;AAMF,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CACtC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,2BAA2B,KAAG,kBAsB3E,CAAC;AAMF,MAAM,WAAW,qCAAqC;IACpD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED,eAAO,MAAM,gCAAgC,GAC3C,OAAO,qCAAqC,KAC3C,4BAMD,CAAC;AAEH,eAAO,MAAM,4BAA4B,GACvC,OAAO,iCAAiC,KACvC,wBAOD,CAAC;AAMH,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED,eAAO,MAAM,2BAA2B,GACtC,OAAO,gCAAgC,KACtC,uBAKD,CAAC"}
|
|
@@ -12,14 +12,17 @@
|
|
|
12
12
|
* correct shape — workspace omits `agentId`; agent carries it non-null.
|
|
13
13
|
*/
|
|
14
14
|
import * as Option from "effect/Option";
|
|
15
|
+
import * as Schema from "effect/Schema";
|
|
15
16
|
import { decodeExtensionNameSync } from "../../../extensions/common.js";
|
|
16
17
|
import { decodeHandleSync } from "../../../extensions/handle.js";
|
|
18
|
+
import { AbsolutePathSchema } from "../../../utils/path-types.js";
|
|
17
19
|
// ---------------------------------------------------------------------------
|
|
18
20
|
// Path helpers (POSIX, since fixtures synthesize POSIX paths)
|
|
19
21
|
// ---------------------------------------------------------------------------
|
|
20
22
|
const POSIX_SEP = "/";
|
|
21
23
|
const splitSegments = (absolute) => absolute.split(POSIX_SEP);
|
|
22
24
|
const join = (parent, child) => parent.endsWith(POSIX_SEP) ? `${parent}${child}` : `${parent}${POSIX_SEP}${child}`;
|
|
25
|
+
const decodeFixtureAbsolutePath = Schema.decodeUnknownSync(AbsolutePathSchema);
|
|
23
26
|
const normalizeFileBackedName = (name) => {
|
|
24
27
|
const normalized = name
|
|
25
28
|
.toLowerCase()
|
|
@@ -62,9 +65,10 @@ const subjectFileNameForAgentDir = (type, name) => {
|
|
|
62
65
|
*/
|
|
63
66
|
export const makeCanonicalOccurrence = (input) => {
|
|
64
67
|
const subjectFileName = subjectFileNameForExtensionType(input.type, input.name);
|
|
68
|
+
const contentLocation = decodeFixtureAbsolutePath(input.contentLocation);
|
|
65
69
|
const subjectFile = subjectFileName === null
|
|
66
70
|
? Option.none()
|
|
67
|
-
: Option.some(join(input.contentLocation, subjectFileName));
|
|
71
|
+
: Option.some(decodeFixtureAbsolutePath(join(input.contentLocation, subjectFileName)));
|
|
68
72
|
const subjectFileExists = input.subjectFileExists ?? (subjectFileName === null ? false : true);
|
|
69
73
|
return {
|
|
70
74
|
_tag: "canonical-extension",
|
|
@@ -73,7 +77,7 @@ export const makeCanonicalOccurrence = (input) => {
|
|
|
73
77
|
origin: input.origin,
|
|
74
78
|
name: decodeExtensionNameSync(input.name),
|
|
75
79
|
owner: input.owner === null ? null : decodeHandleSync(input.owner),
|
|
76
|
-
contentLocation
|
|
80
|
+
contentLocation,
|
|
77
81
|
pathSegments: splitSegments(input.contentLocation),
|
|
78
82
|
subjectFile,
|
|
79
83
|
subjectFileExists,
|
|
@@ -89,11 +93,12 @@ export const makeCanonicalOccurrence = (input) => {
|
|
|
89
93
|
export const makeAgentDirOccurrence = (input) => {
|
|
90
94
|
const resolvedName = input.singleFile === true ? normalizeFileBackedName(input.name) : input.name;
|
|
91
95
|
const subjectFileName = subjectFileNameForAgentDir(input.type, resolvedName);
|
|
96
|
+
const contentLocation = decodeFixtureAbsolutePath(input.contentLocation);
|
|
92
97
|
const subjectFile = input.singleFile === true
|
|
93
|
-
? Option.some(
|
|
98
|
+
? Option.some(contentLocation)
|
|
94
99
|
: subjectFileName === null
|
|
95
100
|
? Option.none()
|
|
96
|
-
: Option.some(join(input.contentLocation, subjectFileName));
|
|
101
|
+
: Option.some(decodeFixtureAbsolutePath(join(input.contentLocation, subjectFileName)));
|
|
97
102
|
const subjectFileExists = input.subjectFileExists ?? true;
|
|
98
103
|
return {
|
|
99
104
|
_tag: "agent-dir",
|
|
@@ -101,7 +106,7 @@ export const makeAgentDirOccurrence = (input) => {
|
|
|
101
106
|
type: input.type,
|
|
102
107
|
agentId: input.agentId,
|
|
103
108
|
name: resolvedName,
|
|
104
|
-
contentLocation
|
|
109
|
+
contentLocation,
|
|
105
110
|
pathSegments: splitSegments(input.contentLocation),
|
|
106
111
|
subjectFile,
|
|
107
112
|
subjectFileExists,
|
|
@@ -112,7 +117,7 @@ export const makeWorkspaceMcpConfigOccurrence = (input) => ({
|
|
|
112
117
|
scope: input.scope,
|
|
113
118
|
origin: "workspace",
|
|
114
119
|
name: decodeExtensionNameSync(input.name),
|
|
115
|
-
contentLocation: input.contentLocation,
|
|
120
|
+
contentLocation: decodeFixtureAbsolutePath(input.contentLocation),
|
|
116
121
|
});
|
|
117
122
|
export const makeAgentMcpConfigOccurrence = (input) => ({
|
|
118
123
|
_tag: "mcp-config",
|
|
@@ -120,12 +125,12 @@ export const makeAgentMcpConfigOccurrence = (input) => ({
|
|
|
120
125
|
origin: "agent",
|
|
121
126
|
agentId: input.agentId,
|
|
122
127
|
name: decodeExtensionNameSync(input.name),
|
|
123
|
-
contentLocation: input.contentLocation,
|
|
128
|
+
contentLocation: decodeFixtureAbsolutePath(input.contentLocation),
|
|
124
129
|
});
|
|
125
130
|
export const makeAgentSettingsOccurrence = (input) => ({
|
|
126
131
|
_tag: "agent-settings",
|
|
127
132
|
scope: input.scope,
|
|
128
133
|
agentId: input.agentId,
|
|
129
|
-
contentLocation: input.contentLocation,
|
|
134
|
+
contentLocation: decodeFixtureAbsolutePath(input.contentLocation),
|
|
130
135
|
});
|
|
131
136
|
//# sourceMappingURL=occurrences.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"occurrences.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/__fixtures__/occurrences.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAsB,MAAM,+BAA+B,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"occurrences.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/__fixtures__/occurrences.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-layer.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/__fixtures__/test-layer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"test-layer.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/__fixtures__/test-layer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAyB,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAgB,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpF;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,EAAE,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,UAAU,CAAC;CAChF;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,WAAW,EACjB,UAAS,6BAAkC,KAC1C,KAAK,CAAC,KAAK,CACZ,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,GAAG,wBAAwB,GAAG,iBAAiB,EAChF,eAAe,CAqBd,CAAC"}
|
|
@@ -18,6 +18,7 @@ import * as Effect from "effect/Effect";
|
|
|
18
18
|
import * as FileSystem from "effect/FileSystem";
|
|
19
19
|
import * as Layer from "effect/Layer";
|
|
20
20
|
import * as Path from "effect/Path";
|
|
21
|
+
import { makeAbsolutePath } from "../../../utils/path-types.js";
|
|
21
22
|
import { AgentRootResolver, AgentRootResolverLive } from "../agent-root-resolver.js";
|
|
22
23
|
import { WorkspaceReadModelConfig } from "../service.js";
|
|
23
24
|
import { buildFixture } from "./builder.js";
|
|
@@ -43,9 +44,9 @@ export const WorkspaceReadModelTest = (spec, options = {}) => Layer.unwrap(Effec
|
|
|
43
44
|
const pathLayer = Layer.succeed(Path.Path, deps.path);
|
|
44
45
|
const allowedRoot = options.allowedRoot ?? "/";
|
|
45
46
|
const configLayer = Layer.succeed(WorkspaceReadModelConfig, {
|
|
46
|
-
projectRoot: deps.workspaceRoot,
|
|
47
|
-
userHome: deps.userHome,
|
|
48
|
-
allowedRoot,
|
|
47
|
+
projectRoot: makeAbsolutePath(deps.path, deps.workspaceRoot),
|
|
48
|
+
userHome: makeAbsolutePath(deps.path, deps.userHome),
|
|
49
|
+
allowedRoot: makeAbsolutePath(deps.path, allowedRoot),
|
|
49
50
|
});
|
|
50
51
|
return Layer.mergeAll(fsLayer, pathLayer, configLayer, AgentRootResolverLive.pipe(Layer.provide(pathLayer)));
|
|
51
52
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-layer.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/__fixtures__/test-layer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,YAAY,EAA0C,MAAM,cAAc,CAAC;AAmBpF;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAiB,EACjB,UAAyC,EAAE,EAI3C,EAAE,CACF,KAAK,CAAC,MAAM,CACV,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5F,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,GAAG,CAAC;IAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,wBAAwB,EAAE;QAC1D,WAAW,EAAE,IAAI,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"test-layer.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/__fixtures__/test-layer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,YAAY,EAA0C,MAAM,cAAc,CAAC;AAmBpF;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAiB,EACjB,UAAyC,EAAE,EAI3C,EAAE,CACF,KAAK,CAAC,MAAM,CACV,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5F,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,GAAG,CAAC;IAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,wBAAwB,EAAE;QAC1D,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC;QAC5D,QAAQ,EAAE,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;QACpD,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;KACtD,CAAC,CAAC;IACH,OAAO,KAAK,CAAC,QAAQ,CACnB,OAAO,EACP,SAAS,EACT,WAAW,EACX,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CACrD,CAAC;AACJ,CAAC,CAAC,CACH,CAAC"}
|
|
@@ -22,7 +22,7 @@ export declare const scanAgentSubagentFiles: (agentId: string, projectDir: strin
|
|
|
22
22
|
path: string;
|
|
23
23
|
}[] | readonly [{
|
|
24
24
|
readonly path: string;
|
|
25
|
-
}], import("../../../app-error/app-error.ts").AppError,
|
|
25
|
+
}], import("../../../app-error/app-error.ts").AppError, Path.Path | FileSystem.FileSystem> | Effect.Effect<readonly DetectedSubagentFile[], never, never>;
|
|
26
26
|
export declare const scanAllSubagentFiles: (projectDir: string) => Effect.Effect<{
|
|
27
27
|
agentId: "adal" | "amp" | "antigravity" | "augment" | "claude-code" | "cline" | "codebuddy" | "codex" | "command-code" | "continue" | "crush" | "cursor" | "droid" | "gemini-cli" | "github-copilot" | "goose" | "iflow-cli" | "junie" | "kilo" | "kimi-cli" | "kiro-cli" | "kode" | "mcpjam" | "mistral-vibe" | "mux" | "neovate" | "openclaw" | "opencode" | "openhands" | "pi" | "pochi" | "qoder" | "qwen-code" | "replit" | "roo" | "trae" | "trae-cn" | "universal" | "windsurf" | "zencoder";
|
|
28
28
|
agentName: string;
|
|
@@ -32,5 +32,5 @@ export declare const scanAllSubagentFiles: (projectDir: string) => Effect.Effect
|
|
|
32
32
|
}[] | readonly [{
|
|
33
33
|
readonly path: string;
|
|
34
34
|
}];
|
|
35
|
-
}[], import("../../../app-error/app-error.ts").AppError,
|
|
35
|
+
}[], import("../../../app-error/app-error.ts").AppError, Path.Path | FileSystem.FileSystem>;
|
|
36
36
|
//# sourceMappingURL=subagents.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-dir.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/agent-dir.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;AAEzC,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-dir.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/agent-dir.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;AAEzC,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAOzC,OAAO,KAAK,EAAE,kBAAkB,EAAuB,MAAM,YAAY,CAAC;AAmB1E,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,UAAU,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;IACzB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;CACrE;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,mBAAmB,KACxB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAwB,CAAC"}
|
|
@@ -31,6 +31,7 @@
|
|
|
31
31
|
import * as Effect from "effect/Effect";
|
|
32
32
|
import * as Option from "effect/Option";
|
|
33
33
|
import { AGENTS } from "../../../agents/registry.js";
|
|
34
|
+
import { makeAbsolutePath } from "../../../utils/path-types.js";
|
|
34
35
|
import { childEntries, fileExists, filterDirectories, splitAbsolutePathSegments, } from "./fs-helpers.js";
|
|
35
36
|
const SCANNER_NAME = "agent-dir";
|
|
36
37
|
const normalizeFileBackedName = (name) => {
|
|
@@ -99,17 +100,18 @@ const scanSubjectDirectory = (deps, agentId, subject) => Effect.gen(function* ()
|
|
|
99
100
|
const present = yield* fileExists(SCANNER_NAME, fs, diagnostics, subjectAbsolute);
|
|
100
101
|
if (!present)
|
|
101
102
|
return [];
|
|
103
|
+
const contentLocation = makeAbsolutePath(path, subjectAbsolute);
|
|
102
104
|
const occurrence = {
|
|
103
105
|
_tag: "agent-dir",
|
|
104
106
|
scope,
|
|
105
107
|
type: subject.type,
|
|
106
108
|
agentId,
|
|
107
109
|
name: normalizeFileBackedName(path.basename(subjectAbsolute)),
|
|
108
|
-
contentLocation
|
|
110
|
+
contentLocation,
|
|
109
111
|
pathSegments: splitAbsolutePathSegments(path, subjectAbsolute),
|
|
110
112
|
// Single-file surfaces ARE the materialization; the file itself is
|
|
111
113
|
// the subject file and presence has already been confirmed.
|
|
112
|
-
subjectFile: Option.some(
|
|
114
|
+
subjectFile: Option.some(contentLocation),
|
|
113
115
|
subjectFileExists: true,
|
|
114
116
|
};
|
|
115
117
|
return [occurrence];
|
|
@@ -121,15 +123,16 @@ const scanSubjectDirectory = (deps, agentId, subject) => Effect.gen(function* ()
|
|
|
121
123
|
const subjectFileName = subjectFileNameFor(subject.type, name);
|
|
122
124
|
const subjectFilePath = path.join(nameDir, subjectFileName);
|
|
123
125
|
const subjectFileExists = yield* fileExists(SCANNER_NAME, fs, diagnostics, subjectFilePath);
|
|
126
|
+
const contentLocation = makeAbsolutePath(path, nameDir);
|
|
124
127
|
const occurrence = {
|
|
125
128
|
_tag: "agent-dir",
|
|
126
129
|
scope,
|
|
127
130
|
type: subject.type,
|
|
128
131
|
agentId,
|
|
129
132
|
name,
|
|
130
|
-
contentLocation
|
|
133
|
+
contentLocation,
|
|
131
134
|
pathSegments: splitAbsolutePathSegments(path, nameDir),
|
|
132
|
-
subjectFile: Option.some(subjectFilePath),
|
|
135
|
+
subjectFile: Option.some(makeAbsolutePath(path, subjectFilePath)),
|
|
133
136
|
subjectFileExists,
|
|
134
137
|
};
|
|
135
138
|
return occurrence;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-dir.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/agent-dir.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-dir.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/agent-dir.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-settings.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/agent-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;AAEzC,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-settings.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/agent-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;AAEzC,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAQ1D;;;;;;GAMG;AACH,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,UAAU,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;IACzB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IACpE,QAAQ,CAAC,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;CACrD;AAED;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,MAAM,wBAAwB,KAC7B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAA4B,CAAC"}
|
|
@@ -16,6 +16,7 @@ import * as Array from "effect/Array";
|
|
|
16
16
|
import * as Effect from "effect/Effect";
|
|
17
17
|
import * as Option from "effect/Option";
|
|
18
18
|
import { AGENTS } from "../../../agents/registry.js";
|
|
19
|
+
import { makeAbsolutePath } from "../../../utils/path-types.js";
|
|
19
20
|
import { agentRootSegment, makeAgentRootResolverState, } from "./agent-root.js";
|
|
20
21
|
import { fileExists } from "./fs-helpers.js";
|
|
21
22
|
const SCANNER_NAME = "agent-settings";
|
|
@@ -45,7 +46,7 @@ const scanAgentSettings = Effect.fn("workspace.read-model.scanner.agent-settings
|
|
|
45
46
|
_tag: "agent-settings",
|
|
46
47
|
scope,
|
|
47
48
|
agentId: descriptor.id,
|
|
48
|
-
contentLocation: filePath,
|
|
49
|
+
contentLocation: makeAbsolutePath(path, filePath),
|
|
49
50
|
});
|
|
50
51
|
}), { concurrency: "unbounded" });
|
|
51
52
|
return Array.getSomes(occurrences);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-settings.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/agent-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-settings.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/agent-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EACL,gBAAgB,EAChB,0BAA0B,GAE3B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAuBtC;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,IAA8B,EACyB,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;AAEpF,8EAA8E;AAC9E,eAAe;AACf,8EAA8E;AAE9E,MAAM,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC,6CAA6C,CAAC,CAAC,QAAQ,CAAC,EAC1F,IAA8B;IAE9B,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,IAAI,MAAM,CAAC;IAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,IAAI,0BAA0B,EAAE,CAAC;IAEjF,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACvC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EACvB,CAAC,UAAU,EAAE,EAAE,CACb,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,gEAAgE;QAChE,2DAA2D;QAC3D,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAC5C,IAAI,EACJ,UAAU,EACV,WAAW,EACX,iBAAiB,CAClB,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,OAAO,MAAM,CAAC,IAAI,EAA2B,CAAC;QAChD,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QACjF,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC,IAAI,EAA2B,CAAC;QAC5D,OAAO,MAAM,CAAC,IAAI,CAA0B;YAC1C,IAAI,EAAE,gBAAgB;YACtB,KAAK;YACL,OAAO,EAAE,UAAU,CAAC,EAAE;YACtB,eAAe,EAAE,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC;SAClD,CAAC,CAAC;IACL,CAAC,CAAC,EACJ,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC;IAEF,OAAO,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canonical-extensions.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/canonical-extensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"canonical-extensions.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/canonical-extensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;AAUzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAOzC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAQ/D,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,UAAU,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;IACzB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAED;;GAEG;AACH,eAAO,MAAM,8BAA8B,GACzC,MAAM,8BAA8B,KACnC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAkC,CAAC"}
|
|
@@ -32,6 +32,7 @@ import * as Effect from "effect/Effect";
|
|
|
32
32
|
import * as Option from "effect/Option";
|
|
33
33
|
import { decodeExtensionNameSync, isExtensionTypePlural, toExtensionType, } from "../../../extensions/common.js";
|
|
34
34
|
import { decodeHandleSync } from "../../../extensions/handle.js";
|
|
35
|
+
import { makeAbsolutePath } from "../../../utils/path-types.js";
|
|
35
36
|
import { childEntries, fileExists, filterDirectories, splitAbsolutePathSegments, } from "./fs-helpers.js";
|
|
36
37
|
const SCANNER_NAME = "canonical-extensions";
|
|
37
38
|
/**
|
|
@@ -77,10 +78,11 @@ const buildOccurrence = (deps, args) => Effect.gen(function* () {
|
|
|
77
78
|
const subjectFileName = subjectFileNameFor(args.extensionType, resolvedName);
|
|
78
79
|
const subjectFile = subjectFileName === null
|
|
79
80
|
? Option.none()
|
|
80
|
-
: Option.some(path.join(args.nameDir, subjectFileName));
|
|
81
|
+
: Option.some(makeAbsolutePath(path, path.join(args.nameDir, subjectFileName)));
|
|
81
82
|
const subjectFileExists = Option.isSome(subjectFile)
|
|
82
83
|
? yield* fileExists(SCANNER_NAME, fs, diagnostics, subjectFile.value)
|
|
83
84
|
: false;
|
|
85
|
+
const contentLocation = makeAbsolutePath(path, args.nameDir);
|
|
84
86
|
const occurrence = {
|
|
85
87
|
_tag: "canonical-extension",
|
|
86
88
|
scope,
|
|
@@ -88,7 +90,7 @@ const buildOccurrence = (deps, args) => Effect.gen(function* () {
|
|
|
88
90
|
origin: args.origin,
|
|
89
91
|
name: decodeExtensionNameSync(resolvedName),
|
|
90
92
|
owner: args.owner,
|
|
91
|
-
contentLocation
|
|
93
|
+
contentLocation,
|
|
92
94
|
pathSegments: splitAbsolutePathSegments(path, args.nameDir),
|
|
93
95
|
subjectFile,
|
|
94
96
|
subjectFileExists,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canonical-extensions.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/canonical-extensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAGL,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,GAChB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAe,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"canonical-extensions.js","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/canonical-extensions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/mcp-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;AAGzC,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-config.d.ts","sourceRoot":"","sources":["../../../../../../src/unstable/workspace/read-model/scanners/mcp-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;AAGzC,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAEV,mBAAmB,EAEpB,MAAM,YAAY,CAAC;AAQpB;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,UAAU,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;IACzB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IACpE,QAAQ,CAAC,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;CACrD;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,MAAM,oBAAoB,KACzB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAwB,CAAC"}
|
|
@@ -35,6 +35,7 @@ import * as Option from "effect/Option";
|
|
|
35
35
|
import * as Schema from "effect/Schema";
|
|
36
36
|
import { AGENTS } from "../../../agents/registry.js";
|
|
37
37
|
import { decodeExtensionNameSync } from "../../../extensions/common.js";
|
|
38
|
+
import { makeAbsolutePath } from "../../../utils/path-types.js";
|
|
38
39
|
import { agentRootSegment, makeAgentRootResolverState, } from "./agent-root.js";
|
|
39
40
|
const SCANNER_NAME = "mcp-config";
|
|
40
41
|
/**
|
|
@@ -116,12 +117,13 @@ const scanWorkspaceMcp = (deps) => Effect.gen(function* () {
|
|
|
116
117
|
if (Option.isNone(decoded))
|
|
117
118
|
return [];
|
|
118
119
|
const names = extractServerNames(decoded.value);
|
|
120
|
+
const contentLocation = makeAbsolutePath(path, filePath);
|
|
119
121
|
return names.map((name) => ({
|
|
120
122
|
_tag: "mcp-config",
|
|
121
123
|
scope,
|
|
122
124
|
origin: "workspace",
|
|
123
125
|
name,
|
|
124
|
-
contentLocation
|
|
126
|
+
contentLocation,
|
|
125
127
|
}));
|
|
126
128
|
});
|
|
127
129
|
const scanAgentMcp = (deps, descriptor, rootResolverState) => Effect.gen(function* () {
|
|
@@ -136,13 +138,14 @@ const scanAgentMcp = (deps, descriptor, rootResolverState) => Effect.gen(functio
|
|
|
136
138
|
if (Option.isNone(decoded))
|
|
137
139
|
return [];
|
|
138
140
|
const names = extractServerNames(decoded.value);
|
|
141
|
+
const contentLocation = makeAbsolutePath(path, filePath);
|
|
139
142
|
return names.map((name) => ({
|
|
140
143
|
_tag: "mcp-config",
|
|
141
144
|
scope,
|
|
142
145
|
origin: "agent",
|
|
143
146
|
agentId: descriptor.id,
|
|
144
147
|
name,
|
|
145
|
-
contentLocation
|
|
148
|
+
contentLocation,
|
|
146
149
|
}));
|
|
147
150
|
});
|
|
148
151
|
// ---------------------------------------------------------------------------
|