@autohq/cli 0.1.414 → 0.1.415

package/dist/agent-bridge.js

@@ -30820,7 +30820,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.414",
+  version: "0.1.415",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -36373,11 +36373,19 @@ var ProjectApplySourceRequestSchema = external_exports.object({
   dryRun: external_exports.boolean().default(false),
   prune: external_exports.boolean().default(true)
 });
+var ProjectApplySourceLocationSchema = external_exports.object({
+  kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
+  name: external_exports.string().min(1),
+  path: external_exports.string().min(1),
+  file: external_exports.string().min(1),
+  line: external_exports.number().int().positive()
+});
 var ProjectApplyRequestSchema = external_exports.object({
   delete: external_exports.array(ProjectDeleteResourceSchema).default([]),
   dryRun: external_exports.boolean().default(false),
   prune: external_exports.boolean().default(false),
   resources: external_exports.array(ProjectApplyResourceSchema).default([]),
+  sourceLocations: external_exports.array(ProjectApplySourceLocationSchema).default([]),
   assets: ProjectApplyAssetsSchema.default({})
 });
 var ProjectApplySystemConfigSchema = external_exports.object({
@@ -36420,7 +36428,12 @@ var ProjectApplyResponsePrunedSchema = external_exports.object({
 });
 var ProjectApplyPlanDiffSchema = external_exports.object({
   action: external_exports.enum(["add", "remove", "change"]),
-  path: external_exports.string().min(1)
+  path: external_exports.string().min(1),
+  source: ProjectApplySourceLocationSchema.omit({
+    kind: true,
+    name: true,
+    path: true
+  }).optional()
 });
 var ProjectApplyResponseSchema = external_exports.object({
   dryRun: external_exports.boolean().default(false),
@@ -36433,6 +36446,11 @@ var ProjectApplyResponseSchema = external_exports.object({
       kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
       name: external_exports.string().min(1),
       uid: external_exports.string().min(1).optional(),
+      source: ProjectApplySourceLocationSchema.omit({
+        kind: true,
+        name: true,
+        path: true
+      }).optional(),
       diff: external_exports.array(ProjectApplyPlanDiffSchema).optional(),
       diffOmitted: external_exports.number().int().positive().optional()
     })

package/dist/index.js

@@ -20477,7 +20477,7 @@ var init_project_service_accounts = __esm({
 function projectApplyBundleStorageKey(sha256) {
   return `project-apply-bundles/${sha256}.json`;
 }
-var EnvironmentApplyDocumentSchema, IdentityApplyDocumentSchema, AgentApplyDocumentSchema, ConfigApplyDocumentSchema, ProjectApplyResourceSchema, PROJECT_RESOURCE_APPLY_ORDER, PROJECT_RESOURCE_KINDS, PROJECT_APPLY_RESOURCE_KINDS, PROJECT_APPLY_BUNDLE_VERSION, MAX_PROJECT_APPLY_BUNDLE_BYTES, PROJECT_APPLY_BUNDLE_CONTENT_TYPE, ProjectDeleteResourceBaseSchema, ProjectDeleteResourceSchema, AVATAR_ASSET_CONTENT_TYPES, MAX_AVATAR_ASSET_BASE64_LENGTH, ProjectApplyAssetSchema, ProjectApplyAssetsSchema, AvatarAssetUploadResponseSchema, ApplyBundlePathSchema, ProjectApplyBundleFileSchema, ProjectApplyBundleSchema, ProjectApplyBundleRefSchema, ProjectApplyBundleUploadRequestSchema, ProjectApplyBundleUploadResponseSchema, ProjectApplyBundleDirectoryEntrypointSchema, ProjectApplyBundleFileEntrypointSchema, ProjectApplyBundleEntrypointSchema, ProjectApplySourceSchema, ProjectApplySourceRequestSchema, ProjectApplyRequestSchema, ProjectApplySystemConfigSchema, ProjectAppliedResourceSchema, ProjectApplyDiagnosticSchema, ProjectApplyResponsePrunedSchema, ProjectApplyPlanDiffSchema, ProjectApplyResponseSchema, ProjectResourceApplyResultSchema, ProjectResourceApplyAuditActionSchema, ProjectResourceApplyOperationIdSchema, ProjectResourceApplyTriggerArtifactSchema, ProjectResourceApplyWorkflowErrorSchema, ProjectResourceApplyWorkflowInputSchema, ProjectResourceApplyWorkflowResultSchema;
+var EnvironmentApplyDocumentSchema, IdentityApplyDocumentSchema, AgentApplyDocumentSchema, ConfigApplyDocumentSchema, ProjectApplyResourceSchema, PROJECT_RESOURCE_APPLY_ORDER, PROJECT_RESOURCE_KINDS, PROJECT_APPLY_RESOURCE_KINDS, PROJECT_APPLY_BUNDLE_VERSION, MAX_PROJECT_APPLY_BUNDLE_BYTES, PROJECT_APPLY_BUNDLE_CONTENT_TYPE, ProjectDeleteResourceBaseSchema, ProjectDeleteResourceSchema, AVATAR_ASSET_CONTENT_TYPES, MAX_AVATAR_ASSET_BASE64_LENGTH, ProjectApplyAssetSchema, ProjectApplyAssetsSchema, AvatarAssetUploadResponseSchema, ApplyBundlePathSchema, ProjectApplyBundleFileSchema, ProjectApplyBundleSchema, ProjectApplyBundleRefSchema, ProjectApplyBundleUploadRequestSchema, ProjectApplyBundleUploadResponseSchema, ProjectApplyBundleDirectoryEntrypointSchema, ProjectApplyBundleFileEntrypointSchema, ProjectApplyBundleEntrypointSchema, ProjectApplySourceSchema, ProjectApplySourceRequestSchema, ProjectApplySourceLocationSchema, ProjectApplyRequestSchema, ProjectApplySystemConfigSchema, ProjectAppliedResourceSchema, ProjectApplyDiagnosticSchema, ProjectApplyResponsePrunedSchema, ProjectApplyPlanDiffSchema, ProjectApplyResponseSchema, ProjectResourceApplyResultSchema, ProjectResourceApplyAuditActionSchema, ProjectResourceApplyOperationIdSchema, ProjectResourceApplyTriggerArtifactSchema, ProjectResourceApplyWorkflowErrorSchema, ProjectResourceApplyWorkflowInputSchema, ProjectResourceApplyWorkflowResultSchema;
 var init_project_resources = __esm({
   "../../packages/schemas/src/project-resources.ts"() {
     "use strict";
@@ -20616,11 +20616,19 @@ var init_project_resources = __esm({
       dryRun: external_exports.boolean().default(false),
       prune: external_exports.boolean().default(true)
     });
+    ProjectApplySourceLocationSchema = external_exports.object({
+      kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
+      name: external_exports.string().min(1),
+      path: external_exports.string().min(1),
+      file: external_exports.string().min(1),
+      line: external_exports.number().int().positive()
+    });
     ProjectApplyRequestSchema = external_exports.object({
       delete: external_exports.array(ProjectDeleteResourceSchema).default([]),
       dryRun: external_exports.boolean().default(false),
       prune: external_exports.boolean().default(false),
       resources: external_exports.array(ProjectApplyResourceSchema).default([]),
+      sourceLocations: external_exports.array(ProjectApplySourceLocationSchema).default([]),
       assets: ProjectApplyAssetsSchema.default({})
     });
     ProjectApplySystemConfigSchema = external_exports.object({
@@ -20663,7 +20671,12 @@ var init_project_resources = __esm({
     });
     ProjectApplyPlanDiffSchema = external_exports.object({
       action: external_exports.enum(["add", "remove", "change"]),
-      path: external_exports.string().min(1)
+      path: external_exports.string().min(1),
+      source: ProjectApplySourceLocationSchema.omit({
+        kind: true,
+        name: true,
+        path: true
+      }).optional()
     });
     ProjectApplyResponseSchema = external_exports.object({
       dryRun: external_exports.boolean().default(false),
@@ -20676,6 +20689,11 @@ var init_project_resources = __esm({
           kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
           name: external_exports.string().min(1),
           uid: external_exports.string().min(1).optional(),
+          source: ProjectApplySourceLocationSchema.omit({
+            kind: true,
+            name: true,
+            path: true
+          }).optional(),
           diff: external_exports.array(ProjectApplyPlanDiffSchema).optional(),
           diffOmitted: external_exports.number().int().positive().optional()
         })
@@ -38611,7 +38629,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.414",
+      version: "0.1.415",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -39720,9 +39738,113 @@ var init_agent_document_merge = __esm({
   }
 });
 
+// ../../packages/schemas/src/project-apply-files/source-locations.ts
+import { LineCounter, isMap, isSeq, parseAllDocuments } from "yaml";
+function readProjectConfigSourceLocations(file2) {
+  const locations = readYamlLocations(file2, "spec");
+  return Object.values(locations).map((location) => ({
+    ...location,
+    kind: RESOURCE_KIND_CONFIG,
+    name: PROJECT_CONFIG_RESOURCE_NAME
+  }));
+}
+function readAgentDraftSourceLocations(path2, fileIndex) {
+  const normalizedPath = normalizeSourcePath(path2);
+  if (normalizedPath.startsWith("packages/")) {
+    return {};
+  }
+  const file2 = fileIndex.get(normalizedPath);
+  if (!file2) {
+    return {};
+  }
+  return readYamlLocations(file2, "");
+}
+function readYamlLocations(file2, rootPath) {
+  const source = Buffer.from(file2.contentBase64, "base64").toString("utf8");
+  const lineCounter = new LineCounter();
+  const documents = parseAllDocuments(source, {
+    keepSourceTokens: true,
+    lineCounter
+  });
+  if (documents.length !== 1 || documents[0]?.errors.length) {
+    return {};
+  }
+  const locations = {};
+  collectNodeLocations(documents[0]?.contents, rootPath, locations, {
+    file: normalizeSourcePath(file2.path),
+    lineCounter
+  });
+  return locations;
+}
+function collectNodeLocations(node, path2, locations, context) {
+  if (isMap(node)) {
+    for (const pair of node.items) {
+      const key = String(pair.key?.toJSON());
+      if (["import", "imports", "remove", "variables"].includes(key)) {
+        continue;
+      }
+      const childPath = propertyPath(path2, key);
+      recordLocation(
+        pair.key,
+        childPath,
+        locations,
+        context
+      );
+      collectNodeLocations(pair.value, childPath, locations, context);
+    }
+    return;
+  }
+  if (isSeq(node)) {
+    node.items.forEach((item, index) => {
+      const childPath = `${path2}[${index}]`;
+      recordLocation(
+        item,
+        childPath,
+        locations,
+        context
+      );
+      collectNodeLocations(item, childPath, locations, context);
+    });
+  }
+}
+function recordLocation(node, path2, locations, context) {
+  const offset = node?.range?.[0];
+  if (offset === void 0) {
+    return;
+  }
+  const locationPath = path2.startsWith("spec.") ? path2 : compiledPath(path2);
+  locations[locationPath] = {
+    path: locationPath,
+    file: context.file,
+    line: context.lineCounter.linePos(offset).line
+  };
+}
+function compiledPath(path2) {
+  const topLevel = path2.match(/^[^.[]+/)?.[0];
+  if (!topLevel) {
+    return path2;
+  }
+  const target = ["name", "labels", "annotations"].includes(topLevel) ? "metadata" : "spec";
+  return `${target}.${path2}`;
+}
+function propertyPath(parent, key) {
+  const segment = /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(key) ? key : `[${JSON.stringify(key)}]`;
+  if (!parent) {
+    return segment;
+  }
+  return segment.startsWith("[") ? `${parent}${segment}` : `${parent}.${segment}`;
+}
+var init_source_locations = __esm({
+  "../../packages/schemas/src/project-apply-files/source-locations.ts"() {
+    "use strict";
+    init_project_config();
+    init_source();
+  }
+});
+
 // ../../packages/schemas/src/project-apply-files/agent-fields/helpers.ts
 function emptyAgentDraft() {
-  return { metadata: {}, spec: {} };
+  return { metadata: {}, spec: {}, sourceLocations: {} };
 }
 function cloneAgentDraft(draft) {
   return structuredClone(draft);
@@ -40033,7 +40155,7 @@ function splitMetadataAndSpec(document) {
     }
     spec[key] = value;
   }
-  return { metadata, spec };
+  return { metadata, spec, sourceLocations: {} };
 }
 function standaloneResourceError(kind, path2) {
   if (kind === RESOURCE_KIND_ENVIRONMENT) {
@@ -40438,6 +40560,7 @@ function parseAgentDraft(document, path2, fileIndex) {
   const sanitized = sanitizedAgentDocument2(document);
   assertNoLegacyEnvelopeFields(sanitized, path2);
   const draft = emptyAgentDraft();
+  draft.sourceLocations = readAgentDraftSourceLocations(path2, fileIndex);
   for (const [key, value] of Object.entries(sanitized)) {
     if (value === void 0) {
       continue;
@@ -40460,7 +40583,8 @@ function parseAgentDraft(document, path2, fileIndex) {
 function mergeAgentDrafts(base, override) {
   return {
     metadata: mergeDraftTarget("metadata", base.metadata, override.metadata),
-    spec: mergeDraftTarget("spec", base.spec, override.spec)
+    spec: mergeDraftTarget("spec", base.spec, override.spec),
+    sourceLocations: mergeSourceLocations(base, override)
   };
 }
 function applyAgentDraftRemoval(draft, removal) {
@@ -40478,8 +40602,35 @@ function applyAgentDraftRemoval(draft, removal) {
   if (updated !== void 0 || current !== void 0) {
     target[removal.target] = updated;
   }
+  for (const name of removal.names) {
+    const prefix = `spec.${removal.target}.${name}`;
+    next.sourceLocations = Object.fromEntries(
+      Object.entries(next.sourceLocations).filter(
+        ([path2]) => path2 !== prefix && !path2.startsWith(`${prefix}.`)
+      )
+    );
+  }
   return next;
 }
+function mergeSourceLocations(base, override) {
+  let merged = { ...base.sourceLocations };
+  for (const target of ["metadata", "spec"]) {
+    for (const [key, value] of Object.entries(override[target])) {
+      if (value === void 0) {
+        continue;
+      }
+      const prefix = `${target}.${key}`;
+      if (!isRecord2(value)) {
+        merged = Object.fromEntries(
+          Object.entries(merged).filter(
+            ([path2]) => path2 !== prefix && !path2.startsWith(`${prefix}.`)
+          )
+        );
+      }
+    }
+  }
+  return { ...merged, ...override.sourceLocations };
+}
 function assertSupportedAgentRemovalTarget(target) {
   const supported = supportedRemovalTargets();
   if (!supported.includes(target)) {
@@ -40549,6 +40700,8 @@ var AGENT_FIELDS;
 var init_agent_fields = __esm({
   "../../packages/schemas/src/project-apply-files/agent-fields/index.ts"() {
     "use strict";
+    init_source();
+    init_source_locations();
     init_file_backed_string();
     init_helpers();
     init_inline_resource();
@@ -40677,11 +40830,52 @@ function readApplyDocument(path2, document, fileIndex, contextVariables) {
     fileIndex,
     contextVariables
   );
-  return result.resources.map((resource) => ({
-    resource,
-    generatedFromAgent: resource !== result.resource,
-    sourcePath: normalizeSourcePath(path2)
-  }));
+  return result.resources.map((resource) => {
+    let generatedField;
+    switch (resource.kind) {
+      case "environment":
+        generatedField = "spec.environment";
+        break;
+      case "identity":
+        generatedField = "spec.identity";
+        break;
+      default:
+        generatedField = void 0;
+        break;
+    }
+    const generatedLocation = generatedField ? result.sourceLocations[generatedField] : void 0;
+    return {
+      resource,
+      generatedFromAgent: resource !== result.resource,
+      sourcePath: normalizeSourcePath(path2),
+      sourceLocations: sourceLocationsForCompiledResource({
+        resource,
+        primaryResource: result.resource,
+        draftLocations: result.sourceLocations,
+        generatedLocation
+      })
+    };
+  });
+}
+function sourceLocationsForCompiledResource(input) {
+  if (input.resource === input.primaryResource) {
+    return Object.values(input.draftLocations).map((location) => ({
+      ...location,
+      kind: input.resource.kind,
+      name: input.resource.metadata.name
+    }));
+  }
+  if (!input.generatedLocation) {
+    return [];
+  }
+  return [
+    {
+      ...input.generatedLocation,
+      kind: input.resource.kind,
+      name: input.resource.metadata.name,
+      path: "$"
+    }
+  ];
 }
 function validateAgentFragmentDocument(document, path2, context) {
   const normalizedPath = normalizeSourcePath(path2);
@@ -40740,15 +40934,16 @@ function conflictingGeneratedResourceMessage(key, existing, record2) {
   return `Conflicting generated resource "${key}" from agent authoring: ${location}. Inline generated resources must be identical when they share a name.`;
 }
 function compileAgentDocumentValue(document, path2, fileIndex, contextVariables) {
-  return compileAgentDraftResources(
-    compileAgentDocument2(document, path2, {
-      fileIndex,
-      stack: [],
-      variables: /* @__PURE__ */ new Map(),
-      ...contextVariables && Object.keys(contextVariables).length > 0 ? { contextVariables: new Map(Object.entries(contextVariables)) } : {}
-    }),
-    path2
-  );
+  const draft = compileAgentDocument2(document, path2, {
+    fileIndex,
+    stack: [],
+    variables: /* @__PURE__ */ new Map(),
+    ...contextVariables && Object.keys(contextVariables).length > 0 ? { contextVariables: new Map(Object.entries(contextVariables)) } : {}
+  });
+  return {
+    ...compileAgentDraftResources(draft, path2),
+    sourceLocations: draft.sourceLocations
+  };
 }
 function compileAgentDocument2(document, path2, context) {
   const normalizedPath = normalizeSourcePath(path2);
@@ -41101,11 +41296,18 @@ function readProjectApplyDirectorySource(input) {
       ...request.resources.map((resource) => ({
         resource,
         generatedFromAgent: resource.kind !== RESOURCE_KIND_AGENT,
-        sourcePath: file2.path
+        sourcePath: file2.path,
+        sourceLocations: request.sourceLocations.filter(
+          (location) => location.kind === resource.kind && location.name === resource.metadata.name
+        )
       }))
     );
   }
+  const configFile = files.find(
+    (file2) => ["config.yaml", "config.yml"].map((name) => sourcePathJoin(resourceRoot, name)).includes(normalizeSourcePath(file2.path))
+  );
   const configResource = readProjectConfigResource(files, resourceRoot);
+  const configSourceLocations = configFile ? readProjectConfigSourceLocations(configFile) : [];
   const resources = [
     ...dedupeGeneratedResources(resourceRecords),
     ...configResource ? [configResource] : []
@@ -41118,6 +41320,10 @@ function readProjectApplyDirectorySource(input) {
     dryRun: input.dryRun ?? false,
     prune: input.prune ?? true,
     resources,
+    sourceLocations: [
+      ...resourceRecords.flatMap((record2) => record2.sourceLocations),
+      ...configSourceLocations
+    ],
     assets: readApplyAssets(resources, input.readAsset)
   });
 }
@@ -41155,6 +41361,9 @@ function readProjectApplyDocumentSourceFile(file2, options = {}) {
     dryRun: false,
     prune: false,
     resources: dedupeGeneratedResources(resourceRecords),
+    sourceLocations: resourceRecords.flatMap(
+      (record2) => record2.sourceLocations
+    ),
     assets: {}
   });
 }
@@ -41276,6 +41485,7 @@ var init_project_apply_files = __esm({
     init_apply_result();
     init_assets();
     init_source();
+    init_source_locations();
     init_template_injection();
     init_assets();
     init_template_injection();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.414",
+  "version": "0.1.415",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"