@autohq/cli 0.1.137 → 0.1.139

package/dist/agent-bridge.js

@@ -21253,7 +21253,6 @@ var EventRoutingTriggerResultSchema = external_exports.object({
 
 // ../../packages/schemas/src/sessions.ts
 var RESOURCE_KIND_AGENT = "agent";
-var LEGACY_RESOURCE_KIND_SESSION = "session";
 var RESOURCE_KIND_SESSION = RESOURCE_KIND_AGENT;
 var SESSION_HARNESSES = ["claude-code"];
 var TriggerFilterScalarSchema = external_exports.union([
@@ -21909,14 +21908,11 @@ var SessionApplyDocumentSchema = resourceApplyDocumentSchema(
   RESOURCE_KIND_SESSION,
   SessionApplyRequestSchema.shape.spec
 );
-var ProjectApplyResourceSchema = external_exports.preprocess(
-  normalizeLegacySessionKind,
-  external_exports.discriminatedUnion("kind", [
-    EnvironmentApplyDocumentSchema,
-    IdentityApplyDocumentSchema,
-    SessionApplyDocumentSchema
-  ])
-);
+var ProjectApplyResourceSchema = external_exports.discriminatedUnion("kind", [
+  EnvironmentApplyDocumentSchema,
+  IdentityApplyDocumentSchema,
+  SessionApplyDocumentSchema
+]);
 var PROJECT_RESOURCE_APPLY_ORDER = [
   RESOURCE_KIND_CONNECTION,
   RESOURCE_KIND_IDENTITY,
@@ -21932,12 +21928,9 @@ var PROJECT_APPLY_RESOURCE_KINDS = [
 var ProjectDeleteResourceBaseSchema = external_exports.object({
   name: external_exports.string().trim().min(1)
 });
-var ProjectDeleteResourceSchema = external_exports.preprocess(
-  normalizeLegacySessionKind,
-  ProjectDeleteResourceBaseSchema.extend({
-    kind: external_exports.enum(PROJECT_APPLY_RESOURCE_KINDS)
-  })
-);
+var ProjectDeleteResourceSchema = ProjectDeleteResourceBaseSchema.extend({
+  kind: external_exports.enum(PROJECT_APPLY_RESOURCE_KINDS)
+});
 var AVATAR_ASSET_CONTENT_TYPES = ["image/png", "image/jpeg"];
 var MAX_AVATAR_ASSET_BASE64_LENGTH = Math.ceil(MAX_AVATAR_ASSET_BYTES / 3) * 4 + 4;
 var ProjectApplyAssetSchema = external_exports.object({
@@ -21993,12 +21986,6 @@ var ProjectApplyDiagnosticSchema = external_exports.object({
   ]),
   name: external_exports.string().min(1)
 });
-var ProjectApplyResponseResourceKindSchema = external_exports.union([
-  external_exports.enum(PROJECT_RESOURCE_KINDS),
-  external_exports.literal(LEGACY_RESOURCE_KIND_SESSION)
-]).transform(
-  (kind) => kind === LEGACY_RESOURCE_KIND_SESSION ? RESOURCE_KIND_SESSION : kind
-);
 var ProjectApplyResponseSchema = external_exports.object({
   dryRun: external_exports.boolean().default(false),
   resources: external_exports.array(ProjectAppliedResourceSchema),
@@ -22007,28 +21994,19 @@ var ProjectApplyResponseSchema = external_exports.object({
   plan: external_exports.array(
     external_exports.object({
       action: external_exports.enum(["create", "update", "unchanged", "archive"]),
-      kind: ProjectApplyResponseResourceKindSchema,
+      kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
       name: external_exports.string().min(1),
       uid: external_exports.string().min(1).optional()
     })
   ).default([]),
   pruned: external_exports.array(
     external_exports.object({
-      kind: ProjectApplyResponseResourceKindSchema,
+      kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
       name: external_exports.string().min(1),
       uid: external_exports.string().min(1)
     })
   ).default([])
 });
-function normalizeLegacySessionKind(value2) {
-  if (isRecord(value2) && value2.kind === LEGACY_RESOURCE_KIND_SESSION) {
-    return { ...value2, kind: RESOURCE_KIND_SESSION };
-  }
-  return value2;
-}
-function isRecord(value2) {
-  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
-}
 
 // ../../packages/schemas/src/run-diagnostics.ts
 var RUN_DIAGNOSTIC_REALTIME_EVENT = "run.diagnostic";
@@ -26290,7 +26268,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.137",
+  version: "0.1.139",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"

package/dist/index.js

@@ -18062,7 +18062,7 @@ function isChatMessageEvent(trigger) {
 function hasFilterValue(trigger, path2, expected) {
   return trigger.where?.[path2] === expected;
 }
-var RESOURCE_KIND_AGENT, LEGACY_RESOURCE_KIND_SESSION, RESOURCE_KIND_SESSION, SESSION_HARNESSES, TriggerFilterScalarSchema, TriggerFilterPathSchema, TriggerFilterClauseSchema, TriggerFilterSchema, SessionTriggerCheckTimeoutSchema, TriggerEventSchema, TriggerEventsSchema, SessionTriggerSharedFields, SessionTriggerEventSourceFields, SessionTriggerBaseSchema, SessionTriggerDefinitionBaseSchema, SessionTriggerSchema, SessionApplyTriggerSchema, SessionHeartbeatTriggerBaseSchema, SessionHeartbeatTriggerSchema, SessionApplyHeartbeatTriggerSchema, SessionTriggerDefinitionSchema, SessionApplyTriggerDefinitionSchema, SessionTriggersSchema, SessionApplyTriggersSchema, AVATAR_ASSET_EXTENSIONS, MAX_AVATAR_ASSET_BYTES, MIN_AVATAR_ASSET_DIMENSION_PX, MAX_AVATAR_ASSET_DIMENSION_PX, PNG_SIGNATURE, SESSION_IDENTITY_DESCRIPTION_MAX_LENGTH, SHA256_HEX_PATTERN, SessionIdentitySchema, SessionSpecFieldsSchema, SessionSpecSchema, SessionApplySpecSchema, SessionStatusSchema, SessionResourceSchema, SessionApplyRequestSchema, SessionApplyTriggerReceiptSchema, SessionApplyResponseSchema, SESSION_TELEGRAM_IDENTITY_STATUSES, SessionTelegramIdentityStatusSchema, SessionPresenceIdentitySchema, SessionPresenceResponseSchema, SessionPresenceConnectRequestSchema, SessionPresenceConnectPendingSchema, SessionPresenceConnectResponseSchema, SessionPresenceIconRequestSchema, SessionPresenceIconResponseSchema, SessionPresenceCompleteResponseSchema;
+var RESOURCE_KIND_AGENT, RESOURCE_KIND_SESSION, SESSION_HARNESSES, TriggerFilterScalarSchema, TriggerFilterPathSchema, TriggerFilterClauseSchema, TriggerFilterSchema, SessionTriggerCheckTimeoutSchema, TriggerEventSchema, TriggerEventsSchema, SessionTriggerSharedFields, SessionTriggerEventSourceFields, SessionTriggerBaseSchema, SessionTriggerDefinitionBaseSchema, SessionTriggerSchema, SessionApplyTriggerSchema, SessionHeartbeatTriggerBaseSchema, SessionHeartbeatTriggerSchema, SessionApplyHeartbeatTriggerSchema, SessionTriggerDefinitionSchema, SessionApplyTriggerDefinitionSchema, SessionTriggersSchema, SessionApplyTriggersSchema, AVATAR_ASSET_EXTENSIONS, MAX_AVATAR_ASSET_BYTES, MIN_AVATAR_ASSET_DIMENSION_PX, MAX_AVATAR_ASSET_DIMENSION_PX, PNG_SIGNATURE, SESSION_IDENTITY_DESCRIPTION_MAX_LENGTH, SHA256_HEX_PATTERN, SessionIdentitySchema, SessionSpecFieldsSchema, SessionSpecSchema, SessionApplySpecSchema, SessionStatusSchema, SessionResourceSchema, SessionApplyRequestSchema, SessionApplyTriggerReceiptSchema, SessionApplyResponseSchema, SESSION_TELEGRAM_IDENTITY_STATUSES, SessionTelegramIdentityStatusSchema, SessionPresenceIdentitySchema, SessionPresenceResponseSchema, SessionPresenceConnectRequestSchema, SessionPresenceConnectPendingSchema, SessionPresenceConnectResponseSchema, SessionPresenceIconRequestSchema, SessionPresenceIconResponseSchema, SessionPresenceCompleteResponseSchema;
 var init_sessions = __esm({
   "../../packages/schemas/src/sessions.ts"() {
     "use strict";
@@ -18075,7 +18075,6 @@ var init_sessions = __esm({
     init_tools();
     init_trigger_router();
     RESOURCE_KIND_AGENT = "agent";
-    LEGACY_RESOURCE_KIND_SESSION = "session";
     RESOURCE_KIND_SESSION = RESOURCE_KIND_AGENT;
     SESSION_HARNESSES = ["claude-code"];
     TriggerFilterScalarSchema = external_exports.union([
@@ -18595,16 +18594,7 @@ var init_project_service_accounts = __esm({
 });
 
 // ../../packages/schemas/src/project-resources.ts
-function normalizeLegacySessionKind(value) {
-  if (isRecord(value) && value.kind === LEGACY_RESOURCE_KIND_SESSION) {
-    return { ...value, kind: RESOURCE_KIND_SESSION };
-  }
-  return value;
-}
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-var EnvironmentApplyDocumentSchema, IdentityApplyDocumentSchema, SessionApplyDocumentSchema, ProjectApplyResourceSchema, PROJECT_RESOURCE_APPLY_ORDER, PROJECT_RESOURCE_KINDS, PROJECT_APPLY_RESOURCE_KINDS, ProjectDeleteResourceBaseSchema, ProjectDeleteResourceSchema, AVATAR_ASSET_CONTENT_TYPES, MAX_AVATAR_ASSET_BASE64_LENGTH, ProjectApplyAssetSchema, ProjectApplyAssetsSchema, AvatarAssetUploadRequestSchema, AvatarAssetUploadResponseSchema, ProjectApplyRequestSchema, ProjectApplySystemConfigSchema, ProjectAppliedResourceSchema, ProjectApplyDiagnosticSchema, ProjectApplyResponseResourceKindSchema, ProjectApplyResponseSchema;
+var EnvironmentApplyDocumentSchema, IdentityApplyDocumentSchema, SessionApplyDocumentSchema, ProjectApplyResourceSchema, PROJECT_RESOURCE_APPLY_ORDER, PROJECT_RESOURCE_KINDS, PROJECT_APPLY_RESOURCE_KINDS, ProjectDeleteResourceBaseSchema, ProjectDeleteResourceSchema, AVATAR_ASSET_CONTENT_TYPES, MAX_AVATAR_ASSET_BASE64_LENGTH, ProjectApplyAssetSchema, ProjectApplyAssetsSchema, AvatarAssetUploadRequestSchema, AvatarAssetUploadResponseSchema, ProjectApplyRequestSchema, ProjectApplySystemConfigSchema, ProjectAppliedResourceSchema, ProjectApplyDiagnosticSchema, ProjectApplyResponseSchema;
 var init_project_resources = __esm({
   "../../packages/schemas/src/project-resources.ts"() {
     "use strict";
@@ -18626,14 +18616,11 @@ var init_project_resources = __esm({
       RESOURCE_KIND_SESSION,
       SessionApplyRequestSchema.shape.spec
     );
-    ProjectApplyResourceSchema = external_exports.preprocess(
-      normalizeLegacySessionKind,
-      external_exports.discriminatedUnion("kind", [
-        EnvironmentApplyDocumentSchema,
-        IdentityApplyDocumentSchema,
-        SessionApplyDocumentSchema
-      ])
-    );
+    ProjectApplyResourceSchema = external_exports.discriminatedUnion("kind", [
+      EnvironmentApplyDocumentSchema,
+      IdentityApplyDocumentSchema,
+      SessionApplyDocumentSchema
+    ]);
     PROJECT_RESOURCE_APPLY_ORDER = [
       RESOURCE_KIND_CONNECTION,
       RESOURCE_KIND_IDENTITY,
@@ -18649,12 +18636,9 @@ var init_project_resources = __esm({
     ProjectDeleteResourceBaseSchema = external_exports.object({
       name: external_exports.string().trim().min(1)
     });
-    ProjectDeleteResourceSchema = external_exports.preprocess(
-      normalizeLegacySessionKind,
-      ProjectDeleteResourceBaseSchema.extend({
-        kind: external_exports.enum(PROJECT_APPLY_RESOURCE_KINDS)
-      })
-    );
+    ProjectDeleteResourceSchema = ProjectDeleteResourceBaseSchema.extend({
+      kind: external_exports.enum(PROJECT_APPLY_RESOURCE_KINDS)
+    });
     AVATAR_ASSET_CONTENT_TYPES = ["image/png", "image/jpeg"];
     MAX_AVATAR_ASSET_BASE64_LENGTH = Math.ceil(MAX_AVATAR_ASSET_BYTES / 3) * 4 + 4;
     ProjectApplyAssetSchema = external_exports.object({
@@ -18710,12 +18694,6 @@ var init_project_resources = __esm({
       ]),
       name: external_exports.string().min(1)
     });
-    ProjectApplyResponseResourceKindSchema = external_exports.union([
-      external_exports.enum(PROJECT_RESOURCE_KINDS),
-      external_exports.literal(LEGACY_RESOURCE_KIND_SESSION)
-    ]).transform(
-      (kind) => kind === LEGACY_RESOURCE_KIND_SESSION ? RESOURCE_KIND_SESSION : kind
-    );
     ProjectApplyResponseSchema = external_exports.object({
       dryRun: external_exports.boolean().default(false),
       resources: external_exports.array(ProjectAppliedResourceSchema),
@@ -18724,14 +18702,14 @@ var init_project_resources = __esm({
       plan: external_exports.array(
         external_exports.object({
           action: external_exports.enum(["create", "update", "unchanged", "archive"]),
-          kind: ProjectApplyResponseResourceKindSchema,
+          kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
           name: external_exports.string().min(1),
           uid: external_exports.string().min(1).optional()
         })
       ).default([]),
       pruned: external_exports.array(
         external_exports.object({
-          kind: ProjectApplyResponseResourceKindSchema,
+          kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
           name: external_exports.string().min(1),
           uid: external_exports.string().min(1)
         })
@@ -21226,7 +21204,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.137",
+      version: "0.1.139",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -21408,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}`);
   }
@@ -21421,6 +21400,7 @@ function compileAgentFile(path2) {
   }
   return {
     resource: parsed.data,
+    resources: [...compiled.resources, parsed.data],
     graph: [...context.graph.values()],
     removals: context.removals
   };
@@ -21428,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}`);
   }
@@ -21441,6 +21422,7 @@ function compileAgentDocumentValue(document, path2) {
   }
   return {
     resource: parsed.data,
+    resources: [...compiled.resources, parsed.data],
     graph: [...context.graph.values()],
     removals: context.removals
   };
@@ -21548,7 +21530,7 @@ function discoverImports(document, path2, stack, imported) {
       `Agent import cycle detected: ${[...stack, resolvedPath].join(" -> ")}`
     );
   }
-  if (!isRecord2(document)) {
+  if (!isRecord(document)) {
     return;
   }
   for (const importPath of importPaths(document)) {
@@ -21569,7 +21551,7 @@ function compileAgentDocument(document, path2, stack, context) {
       `Agent import cycle detected: ${[...stack, resolvedPath].join(" -> ")}`
     );
   }
-  if (!isRecord2(document)) {
+  if (!isRecord(document)) {
     throw new Error(`Invalid agent authoring file ${path2}: expected object`);
   }
   const imports = importPaths(document).map(
@@ -21644,31 +21626,32 @@ function sanitizedAgentDocument(document) {
   delete next.import;
   delete next.imports;
   delete next.remove;
-  if (isRecord2(next.spec) && "remove" in next.spec) {
-    const spec = { ...next.spec };
-    delete spec.remove;
-    next.spec = spec;
-  }
   return next;
 }
 function authoringDocumentApplyShape(document, path2) {
   const sanitized = sanitizedAgentDocument(document);
-  const kind = typeof sanitized.kind === "string" ? sanitized.kind : RESOURCE_KIND_SESSION;
-  const metadata = isRecord2(sanitized.metadata) ? { ...sanitized.metadata } : {};
-  const spec = isRecord2(sanitized.spec) ? { ...sanitized.spec } : {};
+  const legacyEnvelopeFields = ["kind", "metadata", "spec"].filter(
+    (field) => field in sanitized
+  );
+  if (legacyEnvelopeFields.length > 0) {
+    throw new Error(
+      `Invalid agent authoring file ${path2}: legacy resource envelope fields are no longer supported (${legacyEnvelopeFields.join(", ")}). Use root-level Agent facade fields instead.`
+    );
+  }
+  const metadata = {};
+  const spec = {};
   for (const [key, value] of Object.entries(sanitized)) {
     if (key === "kind" || key === "metadata" || key === "spec" || value === void 0) {
       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)) {
@@ -21682,20 +21665,26 @@ function authoringDocumentApplyShape(document, path2) {
     }
   }
   return {
-    kind,
+    kind: RESOURCE_KIND_SESSION,
     metadata,
     spec: resolveFileBackedFields(spec, path2)
   };
 }
-function finalizeAgentApplyShape(document) {
-  if (!isRecord2(document) || !isRecord2(document.spec)) {
-    return document;
+function finalizeAgentApplyShape(document, path2) {
+  if (!isRecord(document) || !isRecord(document.spec)) {
+    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 (!isRecord2(trigger) || !("name" in trigger)) {
+      if (!isRecord(trigger) || !("name" in trigger)) {
         return trigger;
       }
       const compiledTrigger = { ...trigger };
@@ -21703,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) {
@@ -21726,7 +21740,7 @@ function resolveFileBackedFields(spec, path2) {
   };
 }
 function resolveFileBackedString(value, input) {
-  if (!isRecord2(value) || !("file" in value)) {
+  if (!isRecord(value) || !("file" in value)) {
     return value;
   }
   const file2 = value.file;
@@ -21744,12 +21758,8 @@ function resolveFileBackedString(value, input) {
   return readFileSync3(resolve(dirname4(input.path), filePath), "utf8");
 }
 function removalDirectives(document, path2) {
-  const raw = mergeValues2(
-    isRecord2(document.remove) ? document.remove : {},
-    isRecord2(document.spec) && isRecord2(document.spec.remove) ? document.spec.remove : {},
-    []
-  );
-  if (!isRecord2(raw)) {
+  const raw = isRecord(document.remove) ? document.remove : {};
+  if (!isRecord(raw)) {
     return [];
   }
   const directives = [];
@@ -21771,18 +21781,18 @@ function stringList(value, label) {
   });
 }
 function applyRemoval(value, removal) {
-  if (!isRecord2(value)) {
+  if (!isRecord(value)) {
     return value;
   }
   const next = structuredClone(value);
-  if (!isRecord2(next.spec)) {
+  if (!isRecord(next.spec)) {
     return next;
   }
   const spec = { ...next.spec };
   next.spec = spec;
   switch (removal.target) {
     case "tools": {
-      if (!isRecord2(spec[removal.target])) {
+      if (!isRecord(spec[removal.target])) {
         return next;
       }
       const collection = {
@@ -21820,7 +21830,7 @@ function mergeValues2(base, override, path2) {
   if (Array.isArray(base) && Array.isArray(override)) {
     return mergeArrays(base, override, path2);
   }
-  if (isRecord2(base) && isRecord2(override)) {
+  if (isRecord(base) && isRecord(override)) {
     const merged = { ...base };
     for (const [key, value] of Object.entries(override)) {
       merged[key] = mergeValues2(merged[key], value, [...path2, key]);
@@ -21863,7 +21873,7 @@ function isNamedArrayMergePath(path2) {
   return path2 === "spec.mounts" || path2 === "spec.triggers";
 }
 function collectionItemKey(collection, item) {
-  if (!isRecord2(item)) {
+  if (!isRecord(item)) {
     return void 0;
   }
   if (typeof item.name === "string") {
@@ -21895,7 +21905,7 @@ function isAgentFile(path2) {
     return false;
   }
 }
-function isRecord2(value) {
+function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var AGENT_FILE_EXTENSIONS, AGENT_SPEC_FIELDS, AGENT_METADATA_FIELDS;
@@ -21943,31 +21953,97 @@ 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);
   const files = applyFiles(directory);
   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(
@@ -22002,21 +22078,19 @@ function applyFiles(root) {
   const files = [];
   for (const kind of PROJECT_APPLY_RESOURCE_KINDS) {
     const kindFiles = [];
-    for (const directory of applyDirectories(kind)) {
-      const path2 = join4(root, directory);
-      let entries;
-      try {
-        entries = readdirSync3(path2, { withFileTypes: true });
-      } catch {
-        continue;
-      }
-      kindFiles.push(...resourceApplyFiles(path2, entries));
+    const path2 = join4(root, primaryApplyDirectory(kind));
+    let entries;
+    try {
+      entries = readdirSync3(path2, { withFileTypes: true });
+    } catch {
+      continue;
     }
+    kindFiles.push(...resourceApplyFiles(path2, entries));
     const importedFiles = kind === RESOURCE_KIND_SESSION ? importedAgentAuthoringPaths(kindFiles) : /* @__PURE__ */ new Set();
     const appliedFiles = kind === RESOURCE_KIND_SESSION ? kindFiles.filter(
-      (path2) => !importedFiles.has(resolve2(path2)) && !isSharedAgentAuthoringFile(root, path2)
+      (path3) => !importedFiles.has(resolve2(path3)) && !isSharedAgentAuthoringFile(root, path3)
     ) : kindFiles;
-    files.push(...appliedFiles.map((path2) => ({ kind, path: path2 })));
+    files.push(...appliedFiles.map((path3) => ({ kind, path: path3 })));
   }
   return files;
 }
@@ -22025,6 +22099,22 @@ function isSharedAgentAuthoringFile(root, path2) {
   const resolvedPath = resolve2(path2);
   return resolvedPath.startsWith(`${agentsSharedRoot}/`);
 }
+function assertNoLegacySessionFiles(root) {
+  const path2 = join4(root, "sessions");
+  let entries;
+  try {
+    entries = readdirSync3(path2, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  const files = resourceApplyFiles(path2, entries);
+  if (files.length === 0) {
+    return;
+  }
+  throw new Error(
+    `Legacy .auto/sessions files are no longer supported. Move ${files.length === 1 ? "this file" : "these files"} to .auto/agents and use the root-level Agent facade format: ${files.join(", ")}`
+  );
+}
 function mcpOAuthSessionToolConnectionsFromSessionTools(input) {
   return Object.entries(input.tools).flatMap(([alias, tool]) => {
     if (tool.kind !== "mcp_remote" || tool.disabled || tool.auth.kind !== "mcp_oauth") {
@@ -22055,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) {
@@ -22077,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 = {};
@@ -22197,23 +22307,19 @@ function isInside(path2, parent) {
   return path2.startsWith(`${parent}/`);
 }
 function applyCandidate(document) {
-  if (!isRecord3(document) || !("kind" in document)) {
+  if (!isRecord2(document) || !("kind" in document)) {
     return { kind: RESOURCE_KIND_SESSION, value: document };
   }
-  if (document.kind === LEGACY_RESOURCE_KIND_SESSION) {
-    return {
-      kind: RESOURCE_KIND_SESSION,
-      value: {
-        metadata: document.metadata,
-        spec: document.spec
-      }
-    };
+  if (document.kind === "session") {
+    throw new Error(
+      'Legacy resource kind "session" is no longer supported. Use .auto/agents with the root-level Agent facade format.'
+    );
   }
   if (!PROJECT_APPLY_RESOURCE_KINDS.includes(
     document.kind
   )) {
     throw new Error(
-      `Unsupported apply resource kind "${String(document.kind)}"; supported kinds are ${PROJECT_APPLY_RESOURCE_KINDS.map((kind2) => `"${kind2}"`).join(", ")} (legacy alias "session" is also accepted)`
+      `Unsupported apply resource kind "${String(document.kind)}"; supported kinds are ${PROJECT_APPLY_RESOURCE_KINDS.map((kind2) => `"${kind2}"`).join(", ")}`
     );
   }
   const kind = document.kind;
@@ -22225,13 +22331,10 @@ function applyCandidate(document) {
     }
   };
 }
-function applyDirectories(kind) {
-  return [...LEGACY_APPLY_DIRECTORIES[kind] ?? [], APPLY_DIRECTORIES[kind]];
-}
 function primaryApplyDirectory(kind) {
   return APPLY_DIRECTORIES[kind];
 }
-function isRecord3(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function resourceApplyFiles(directory, entries) {
@@ -22250,7 +22353,7 @@ function resourceApplyFiles(directory, entries) {
   }
   return files.sort((left, right) => left.localeCompare(right));
 }
-var APPLY_DIRECTORIES, LEGACY_APPLY_DIRECTORIES, APPLY_SCHEMAS, ALLOWED_AVATAR_EXTENSIONS;
+var APPLY_DIRECTORIES, APPLY_SCHEMAS, ALLOWED_AVATAR_EXTENSIONS;
 var init_files = __esm({
   "src/commands/apply/files.ts"() {
     "use strict";
@@ -22261,9 +22364,6 @@ var init_files = __esm({
       identity: "identities",
       agent: "agents"
     };
-    LEGACY_APPLY_DIRECTORIES = {
-      [RESOURCE_KIND_SESSION]: ["sessions"]
-    };
     APPLY_SCHEMAS = {
       environment: EnvironmentApplyRequestSchema,
       identity: IdentityApplyRequestSchema,
@@ -22563,11 +22663,8 @@ function parseProjectResourceReference(resource) {
   if (!PROJECT_APPLY_RESOURCE_KINDS.includes(
     kind
   )) {
-    if (kind === LEGACY_RESOURCE_KIND_SESSION) {
-      return { kind: RESOURCE_KIND_SESSION, name };
-    }
     throw new Error(
-      `Unsupported resource kind "${kind}"; supported kinds are ${PROJECT_APPLY_RESOURCE_KINDS.map((value) => `"${value}"`).join(", ")} (legacy alias "session" is also accepted)`
+      `Unsupported resource kind "${kind}"; supported kinds are ${PROJECT_APPLY_RESOURCE_KINDS.map((value) => `"${value}"`).join(", ")}`
     );
   }
   return {

package/package.json

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