Merge pull request #919 from taras/agent/upstream-u4-generated-owners

💥 Let a component say what its own spellings are offered as (#181)

Author: taras

architecture.md

@@ -38,11 +38,11 @@
  *
  * `<Fetch>` is absent rather than present-and-bounded. An unbounded network
  * read is a decision this command does not make on a document's behalf, and
- * admitting the identity with an empty ceiling would be a different thing from
- * not admitting it — the fragment would name a component it can never
- * successfully call.
+ * admitting the name with an empty ceiling would be a different thing from not
+ * admitting it — the fragment would name a component it can never successfully
+ * call.
  *
- * ## No Workspace, and no alias
+ * ## No Workspace
  *
  * An ordinary run evaluates against no Workspace. Its admitted effects address
  * the Files provider its own execution installed, and there is no immutable

packages/cli/src/evaluation-profile.ts

@@ -1076,8 +1076,9 @@ export function runWorkflow(
         // about the component. Stated where the Workspace is attached — a
         // completed replay restores its retained output and expands nothing, so
         // it needs no ceiling of its own.
-        // `<Dir>`'s entry comes from the package that owns the component, so
-        // the write table names one identity rather than two copies of it.
+        // `<Dir>`'s entry comes from the Git Plugin, which decides that a
+        // workflow run has one at all; the identity it is admitted under is
+        // core's, from the declaration that owns the component.
         ...(completed || replay
           ? []
           : [

packages/cli/src/workflow.ts

@@ -106,19 +106,15 @@ describe("Tier FE — the workflow host's profile", () => {
     });
   });
 
-  it("FE23: Git's directory entry is the exact identity retained history holds", function* () {
-    // Written out here rather than compared against the implementation, so a
-    // change to either side is a change to this row. Every released journal
-    // holds these strings: the origin a released build recorded, the revision
-    // it recorded, and the version-1 alias whose grant this entry answers for.
+  it("FE23: Git's directory entry admits core's own Dir and states no identity", function* () {
+    // What this host decides is that a workflow run has a `<Dir>` at all. What
+    // admitting it grants is core's: the identity and the effect its paired
+    // spelling runs under are on the declaration that owns the component, so
+    // there is nothing here for a host to restate or to move.
     const entry = gitDirectoryEntry();
     expect(entry.name).toBe("Dir");
-    expect(entry.identity).toEqual({
-      origin: "@executablemd/workflow/composition",
-      key: "Dir",
-      revision: "3",
-    });
-    expect(Reflect.get(entry, "legacy")).toEqual(["@executablemd/workflow/composition/dir-v2#Dir"]);
+    expect(Object.keys(entry)).not.toContain("identity");
+    expect(Object.keys(entry)).not.toContain("legacy");
     // It is the directory capability, not some other entry wearing the name.
     expect(Reflect.get(entry, "capability")).toBe("directory:ensure");
   });

packages/cli/tests/evaluate-workflow.test.ts

@@ -1184,12 +1184,7 @@ describe("Tier PI — read-only information requests", () => {
 
   /** The admitted entry the barrier is written as. */
   function heldEntry(): FragmentEntry {
-    return {
-      kind: "component-answer",
-      name: "Held",
-      identity: { origin: HELD_ORIGIN, key: "Held", revision: "1" },
-      forms: ["self-closing"],
-    };
+    return { kind: "component-answer", name: "Held", forms: ["self-closing"] };
   }
 
   /** One barrier: a body whose cleanup blocks until the case releases it. */
@@ -1209,6 +1204,13 @@ describe("Tier PI — read-only information requests", () => {
           kind: "function",
           name: "Held",
           props: { type: "object", properties: {}, additionalProperties: false },
+          forms: ["self-closing"],
+          generated: {
+            "self-closing": {
+              identity: "https://executable.md/components/held/read",
+              effect: "read",
+            },
+          },
           *fn(): Operation<Json> {
             // Registered before anything can fail, so the barrier is reached
             // whichever way this projection ends.
@@ -1219,7 +1221,7 @@ describe("Tier PI — read-only information requests", () => {
             return "held";
           },
         },
-        { origin: HELD_ORIGIN, key: "Held", revision: "1" },
+        { origin: HELD_ORIGIN },
       ),
     };
   }

packages/cli/tests/plan-command-document.test.ts

@@ -2027,17 +2027,16 @@ describe("Tier FE — Plan produces text, Evaluate runs it", () => {
    * The profile these rows evaluate under: the read entry, and never the wide
    * one.
    *
-   * The entry's identity is the fixture's own, so the catalog an agent is shown
-   * inside an evaluation names `test://fe713/read` and the admitted capability
-   * is core's file read behind it.
+   * The entry's name is the fixture's own, so the catalog an agent is shown
+   * inside an evaluation names `<FE713.Read>` and the admitted capability is
+   * core's file read behind it.
    */
   function fixtureProfile(): FragmentEvaluationInput {
     return {
       read: [
         {
           ...fileReadEntry(),
           name: READ_COMPONENT.name,
-          identity: { origin: READ_COMPONENT.origin, key: "FE713.Read", revision: "1" },
           description: READ_COMPONENT.description,
         },
       ],
@@ -2163,7 +2162,10 @@ describe("Tier FE — Plan produces text, Evaluate runs it", () => {
       expect(seen).toHaveLength(1);
       const catalog = seen[0] ?? "";
       expect(catalog).toContain(READ_MARKER);
-      expect(catalog).toContain(READ_COMPONENT.origin);
+      // Reported as the implementation it runs rather than as the name it was
+      // admitted under: the entry is core's own file read, which is what the
+      // host chose to admit under a name of its own.
+      expect(catalog).toContain("@executablemd/core");
       // The wide-only component exists in this scope and is not in the profile,
       // so its absence here is the narrowing rather than the fixture.
       expect(catalog).not.toContain(WIDE_MARKER);

packages/cli/tests/plan-component.test.ts

@@ -722,16 +722,21 @@ describe("Tier WAL — the workflow Agent observation loop", () => {
       });
 
       expect(attempt.failure).toBe(undefined);
-      // The standard profile admitted it: one record, naming both write
-      // identities and the classes the document selected.
+      // The standard profile admitted it: one record, naming both admitted
+      // spellings and the classes the document selected.
       const recorded = admitted(attempt.events);
       expect(recorded).toHaveLength(1);
       const policy = JSON.stringify(recorded[0]);
-      expect(policy).toContain("File:write");
-      // The identity is a structural record, so the origin, the key and the
-      // revision are read as themselves rather than as one assembled spelling.
-      expect(policy).toContain('"origin":"@executablemd/workflow/composition"');
-      expect(policy).toContain('"key":"Dir","revision":"3"');
+      // What each spelling runs as comes from the declaration that owns the
+      // implementation, so the row holds that URL and the table that admitted
+      // it rather than a spelling a host assembled.
+      expect(policy).toContain(
+        '"name":"File","form":"paired","identity":"https://executable.md/components/file/write"',
+      );
+      expect(policy).toContain(
+        '"name":"Dir","form":"paired","identity":"https://executable.md/components/dir/ensure"',
+      );
+      expect(policy).toContain('"effect":"write"');
       expect(policy).toContain('"allow":["write"]');
       // And the change is in the run's own Workspace, where an ordinary read
       // beneath the fragment's own directory finds it. Anchored on the

packages/cli/tests/workflow-agent.test.ts

@@ -821,6 +821,15 @@ const PROMPT_EFFECT = "agent_prompt"; // packages/core/src/agent/journal.ts
 const EVALUATION_EFFECT = "generated_xmd"; // packages/core/src/generated-xmd.ts
 const FILE_EFFECT = WORKSPACE_FILE;
 
+/**
+ * What core's own declaration offers the paired `<Dir>` as.
+ *
+ * Spelled here rather than imported, because a case about what a retained
+ * admission holds has to name the string the journal holds: reading it from the
+ * component the resume also reads would agree with itself after a rename.
+ */
+const DIR_ENSURE = "https://executable.md/components/dir/ensure";
+
 /** Every prompt this run's agent was actually asked. */
 interface AgentCalls {
   readonly prompts: string[];
@@ -1508,10 +1517,10 @@ the retained note
     });
   }
 
-  // WGAC17: `allow={["write"]}` admits the versioned paired `<Dir>`, and that
-  // entry now authorizes persistent recursive creation. The former identity
-  // authorized placement that created nothing, so a run admitted under it must
-  // not silently receive the wider permission.
+  // WGAC17: `allow={["write"]}` admits the paired `<Dir>`, which authorizes
+  // persistent recursive creation. A run admitted under a different identity
+  // for that spelling was granted something else, so it must not silently
+  // receive this permission on resume.
   //
   // Two halves, and neither is evidence alone. The control shows the current
   // admission really does execute its generated `<Dir>` and really does resume
@@ -1541,12 +1550,14 @@ the retained note
 
     const suspended = retained(path);
     expect(suspended.status).toBe("suspended");
-    // The admission carries the versioned identity. It is a structural record
-    // rather than a spelling, and the version is the `revision` member — so
-    // that is what this reads, and what the refusal below moves.
+    // The admission carries the identity core's own declaration offers the
+    // paired spelling as, in the write table that admitted it — so that is what
+    // this reads, and what the refusal below moves.
     expect(
       readRecords(path).some(
-        (record) => record.includes(`"key":"Dir"`) && record.includes(`"revision":"3"`),
+        (record) =>
+          record.includes(`"name":"Dir","form":"paired","identity":"${DIR_ENSURE}"`) &&
+          record.includes(`"effect":"write"`),
       ),
     ).toBe(true);
 
@@ -1616,19 +1627,18 @@ the retained note
     expect(counts(path)).toEqual(atSuspension);
   });
 
-  it("WGAC17: a continuation retaining the former Dir identity refuses before generated execution and mutation", function* () {
+  it("WGAC17: a continuation retaining another Dir identity refuses before generated execution and mutation", function* () {
     const store = yield* useRunStore();
     const { runId, path, rendered, calls } = yield* wgac17(store);
 
-    // The run becomes one admitted under the former identity. Nothing else
-    // changes — same source, roots and selection — so the identity is the only
-    // thing the resume can disagree about.
-    //
-    // The version is the `revision` member, and core's own entries state `2`,
-    // so `"revision":"3"` names the Dir entry and nothing else. Moving it back
-    // is exactly "admitted under the earlier revision", which is the grant the
-    // former placement-only Dir had.
-    rewriteRecords(path, (record) => record.replaceAll(`"revision":"3"`, `"revision":"2"`));
+    // The run becomes one admitted under a different identity for the same
+    // spelling of the same name. Nothing else changes — same source, roots and
+    // selection — so the identity is the only thing the resume can disagree
+    // about, and it is still a URL this engine can read: the refusal is the
+    // grant comparison rather than an unreadable record.
+    rewriteRecords(path, (record) =>
+      record.replaceAll(DIR_ENSURE, "https://executable.md/components/dir/placement"),
+    );
     const beforeResume = counts(path);
     const rootsBeforeResume = workspaceRootState(path);
 
@@ -1646,11 +1656,10 @@ the retained note
     expect(workspaceRootState(path)).toEqual(rootsBeforeResume);
     // Nothing after the wait reached the document either.
     expect(rendered).toEqual([]);
-    // And the refusal does not publish which identity moved. The identity is
-    // four members now, so this reads the two a refusal could carry: the origin
-    // that owns the implementation, and the member the rewrite actually moved.
+    // And the refusal does not publish which identity moved: neither the one
+    // the admission holds nor the one the rewrite put there.
     const reported = resumed.written.err.join("\n");
-    expect(reported).not.toContain("@executablemd/workflow/composition");
-    expect(reported).not.toContain("revision");
+    expect(reported).not.toContain(DIR_ENSURE);
+    expect(reported).not.toContain("/components/dir/placement");
   });
 });

packages/cli/tests/workflow-suspension.test.ts

@@ -97,7 +97,6 @@ export type {
   FragmentEntry,
   FragmentEvaluationInput,
   FragmentForm,
-  FragmentIdentity,
   FragmentWorkspaceAccess,
 } from "./src/evaluation-profile.ts";
 /**
@@ -329,11 +328,11 @@ export {
 export type {
   GeneratedComponentForm,
   GeneratedEffectClass,
+  GeneratedImplementation,
   GeneratedMutation,
   GeneratedObservation,
   GeneratedRequest,
   GeneratedXmdRequest,
-  RetainedFragmentIdentity,
 } from "./src/generated-xmd.ts";
 
 /**

packages/core/host.ts

@@ -286,6 +286,13 @@ export {
   registerComponents,
 } from "./src/components/registration.ts";
 export type { ComponentRegistration } from "./src/components/registration.ts";
+// What a registration says about the generated use of its own forms. The two
+// members a declaration states; nothing here reads or publishes a catalog of them.
+export type {
+  GeneratedEffect,
+  GeneratedForm,
+  GeneratedForms,
+} from "./src/components/generated-metadata.ts";
 export { DEFAULT_INCLUDES, selectComponent } from "./src/components/select.ts";
 export type { SelectOptions } from "./src/components/select.ts";
 export { CORE_COMPONENT_NAMES } from "./src/components/registry.ts";