@autohq/cli 0.1.138 → 0.1.139

package/dist/agent-bridge.js

@@ -26268,7 +26268,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.138",
+  version: "0.1.139",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"

package/dist/index.js

@@ -21204,7 +21204,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.138",
+      version: "0.1.139",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -21386,9 +21386,10 @@ function compileAgentFile(path2) {
   const context = { graph: /* @__PURE__ */ new Map(), removals: [] };
   const document = readSingleDocument(path2);
   const compiled = finalizeAgentApplyShape(
-    compileAgentDocument(document, path2, [], context)
+    compileAgentDocument(document, path2, [], context),
+    path2
   );
-  const parsed = ProjectApplyResourceSchema.safeParse(compiled);
+  const parsed = ProjectApplyResourceSchema.safeParse(compiled.resource);
   if (!parsed.success) {
     throw new Error(`Invalid compiled agent ${path2}: ${parsed.error.message}`);
   }
@@ -21399,6 +21400,7 @@ function compileAgentFile(path2) {
   }
   return {
     resource: parsed.data,
+    resources: [...compiled.resources, parsed.data],
     graph: [...context.graph.values()],
     removals: context.removals
   };
@@ -21406,9 +21408,10 @@ function compileAgentFile(path2) {
 function compileAgentDocumentValue(document, path2) {
   const context = { graph: /* @__PURE__ */ new Map(), removals: [] };
   const compiled = finalizeAgentApplyShape(
-    compileAgentDocument(document, path2, [], context)
+    compileAgentDocument(document, path2, [], context),
+    path2
   );
-  const parsed = ProjectApplyResourceSchema.safeParse(compiled);
+  const parsed = ProjectApplyResourceSchema.safeParse(compiled.resource);
   if (!parsed.success) {
     throw new Error(`Invalid compiled agent ${path2}: ${parsed.error.message}`);
   }
@@ -21419,6 +21422,7 @@ function compileAgentDocumentValue(document, path2) {
   }
   return {
     resource: parsed.data,
+    resources: [...compiled.resources, parsed.data],
     graph: [...context.graph.values()],
     removals: context.removals
   };
@@ -21641,14 +21645,13 @@ function authoringDocumentApplyShape(document, path2) {
       continue;
     }
     if (AGENT_METADATA_FIELDS.has(key)) {
-      const metadataKey = key === "name" ? "name" : key;
       assertNoDuplicateFacadeField({
         path: path2,
         field: key,
-        target: `metadata.${metadataKey}`,
-        targetValue: metadata[metadataKey]
+        target: `metadata.${key}`,
+        targetValue: metadata[key]
       });
-      metadata[metadataKey] = value;
+      metadata[key] = value;
       continue;
     }
     if (AGENT_SPEC_FIELDS.has(key)) {
@@ -21667,12 +21670,18 @@ function authoringDocumentApplyShape(document, path2) {
     spec: resolveFileBackedFields(spec, path2)
   };
 }
-function finalizeAgentApplyShape(document) {
+function finalizeAgentApplyShape(document, path2) {
   if (!isRecord(document) || !isRecord(document.spec)) {
-    return document;
+    return { resource: document, resources: [] };
   }
   const next = structuredClone(document);
   const spec = next.spec;
+  const resources = [];
+  if (isRecord(spec.environment)) {
+    const environment = inlineEnvironmentResource(spec.environment, path2);
+    spec.environment = environment.metadata.name;
+    resources.push(environment);
+  }
   if (Array.isArray(spec.triggers)) {
     spec.triggers = spec.triggers.map((trigger) => {
       if (!isRecord(trigger) || !("name" in trigger)) {
@@ -21683,7 +21692,32 @@ function finalizeAgentApplyShape(document) {
       return compiledTrigger;
     });
   }
-  return next;
+  return { resource: next, resources };
+}
+function inlineEnvironmentResource(document, path2) {
+  const metadata = {};
+  const spec = {};
+  for (const [key, value] of Object.entries(document)) {
+    if (value === void 0) {
+      continue;
+    }
+    if (AGENT_METADATA_FIELDS.has(key)) {
+      metadata[key] = value;
+      continue;
+    }
+    spec[key] = value;
+  }
+  const parsed = EnvironmentApplyRequestSchema.safeParse({ metadata, spec });
+  if (!parsed.success) {
+    throw new Error(
+      `Invalid inline environment in ${path2}: ${parsed.error.message}`
+    );
+  }
+  return {
+    kind: RESOURCE_KIND_ENVIRONMENT,
+    metadata: parsed.data.metadata,
+    spec: parsed.data.spec
+  };
 }
 function assertNoDuplicateFacadeField(input) {
   if (input.targetValue !== void 0) {
@@ -21919,11 +21953,18 @@ function readProjectApplyRequest(options) {
   }
   if (options.file) {
     const request = readApplyDocumentFile(options.file);
+    const resources2 = dedupeGeneratedResources(request.resourceRecords);
     const assets2 = readApplyAssets(
-      request.resources,
+      resources2,
       applyFileProjectRoot(options.file)
     );
-    return { ...request, assets: assets2 };
+    return {
+      delete: request.delete,
+      dryRun: request.dryRun,
+      prune: request.prune,
+      resources: resources2,
+      assets: assets2
+    };
   }
   const directory = options.directory ?? join4(process.cwd(), ".auto");
   assertNoLegacySessionFiles(directory);
@@ -21931,20 +21972,78 @@ function readProjectApplyRequest(options) {
   if (files.length === 0) {
     throw new Error(`No resource files found in ${directory}`);
   }
-  const resources = [];
+  const resourceRecords = [];
   for (const { kind, path: path2 } of files) {
     const request = readApplyDocumentFile(path2);
-    for (const resource of request.resources) {
-      if (resource.kind !== kind) {
+    for (const { resource, generatedFromAgent } of request.resourceRecords) {
+      if (!isAllowedDirectoryResourceKind(kind, resource, generatedFromAgent)) {
         throw new Error(
           `Resource kind "${resource.kind}" in ${path2} does not match .auto/${primaryApplyDirectory(kind)}`
         );
       }
-      resources.push(resource);
+      resourceRecords.push({ resource, generatedFromAgent });
     }
   }
+  const resources = dedupeGeneratedResources(resourceRecords);
   const assets = readApplyAssets(resources, applyProjectRoot(directory));
-  return { delete: [], dryRun: false, prune: true, resources, assets };
+  return {
+    delete: [],
+    dryRun: false,
+    prune: true,
+    resources,
+    assets
+  };
+}
+function isAllowedDirectoryResourceKind(directoryKind, resource, generatedFromAgent) {
+  if (resource.kind === directoryKind) {
+    return true;
+  }
+  return directoryKind === RESOURCE_KIND_SESSION && resource.kind === RESOURCE_KIND_ENVIRONMENT && generatedFromAgent;
+}
+function dedupeGeneratedResources(records) {
+  const recordsByKey = /* @__PURE__ */ new Map();
+  const deduped = [];
+  for (const record2 of records) {
+    const { resource } = record2;
+    const key = `${resource.kind}/${resource.metadata.name}`;
+    const existing = recordsByKey.get(key);
+    if (!existing) {
+      recordsByKey.set(key, record2);
+      deduped.push(record2);
+      continue;
+    }
+    if (!record2.generatedFromAgent && !existing.generatedFromAgent) {
+      deduped.push(record2);
+      continue;
+    }
+    if (stableResource(resource) !== stableResource(existing.resource)) {
+      throw new Error(
+        `Conflicting generated resource "${key}" from agent authoring. Inline environment definitions must be identical when they share a name.`
+      );
+    }
+  }
+  return deduped.map((record2) => record2.resource);
+}
+function stableResource(resource) {
+  return JSON.stringify({
+    kind: resource.kind,
+    metadata: metadataComparable(resource.metadata),
+    spec: sortJson(resource.spec)
+  });
+}
+function metadataComparable(metadata) {
+  return sortJson(metadata);
+}
+function sortJson(value) {
+  if (Array.isArray(value)) {
+    return value.map(sortJson);
+  }
+  if (isRecord2(value)) {
+    return Object.fromEntries(
+      Object.entries(value).sort(([left], [right]) => left.localeCompare(right)).map(([key, nested]) => [key, sortJson(nested)])
+    );
+  }
+  return value;
 }
 function appliedResourceKind(request, response, index) {
   const plannedResources = response.plan.filter(
@@ -22046,21 +22145,36 @@ function readApplyDocumentFile(path2) {
   if (documents.length === 1) {
     const system = ProjectApplySystemConfigSchema.safeParse(documents[0]);
     if (system.success) {
-      return system.data.spec;
+      const resources = system.data.spec.resources;
+      return {
+        ...system.data.spec,
+        resourceRecords: resources.map((resource) => ({
+          resource,
+          generatedFromAgent: false
+        }))
+      };
     }
   }
+  const resourceRecords = documents.flatMap(
+    (document) => readApplyDocument(document, path2)
+  );
   return {
     delete: [],
     dryRun: false,
     prune: false,
-    resources: documents.map((document) => readApplyDocument(document, path2)),
+    resources: resourceRecords.map((record2) => record2.resource),
+    resourceRecords,
     assets: {}
   };
 }
 function readApplyDocument(document, path2) {
   const candidate = applyCandidate(document);
   if (candidate.kind === RESOURCE_KIND_SESSION) {
-    return compileAgentDocumentValue(document, path2).resource;
+    const result = compileAgentDocumentValue(document, path2);
+    return result.resources.map((resource) => ({
+      resource,
+      generatedFromAgent: resource !== result.resource
+    }));
   }
   const parsed = APPLY_SCHEMAS[candidate.kind].safeParse(candidate.value);
   if (!parsed.success) {
@@ -22068,11 +22182,16 @@ function readApplyDocument(document, path2) {
       `Invalid ${candidate.kind} resource: ${parsed.error.message}`
     );
   }
-  return {
-    kind: candidate.kind,
-    metadata: parsed.data.metadata,
-    spec: parsed.data.spec
-  };
+  return [
+    {
+      resource: {
+        kind: candidate.kind,
+        metadata: parsed.data.metadata,
+        spec: parsed.data.spec
+      },
+      generatedFromAgent: false
+    }
+  ];
 }
 function readApplyAssets(resources, projectRoot) {
   const assets = {};

package/package.json

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