Merge remote-tracking branch 'origin/main' into copilot/checkout-pr-b…

…ranch-bot-permission-fix # Conflicts: # actions/setup/js/work_queue_issues_checks.cjs # pkg/workflow/agy_engine_test.go Co-authored-by: gh-aw-bot <259018956+gh-aw-bot@users.noreply.github.com>
pelikhan · Oct 10, 2026 · Oct 9, 2026 · Oct 9, 2026 · Oct 9, 2026 · Oct 9, 2026
commit 26b04e713db59878def59143ea7a6dcbabe05df3
diff --git a/actions/setup/js/work_queue_issues_checks.cjs b/actions/setup/js/work_queue_issues_checks.cjs
@@ -122,25 +122,31 @@ function mock(f, { labelMissing = false } = {}) {
       git: {
         getRef: async ({ ref }) => {
           calls.push(["ledger-ref"]);
-          assert.equal(ref, "heads/work-queue");
-          return { data: { object: { sha } } };
+          if (ref === "heads/main") return { data: { object: { sha: "b".repeat(40) } } };
+          if (ref === "heads/work-queue") return { data: { object: { sha } } };
+          throw Object.assign(new Error("Not found"), { status: 404 });
         },
         getCommit: async ({ commit_sha }) => {
           calls.push(["ledger-commit"]);
-          assert.equal(commit_sha, sha);
-          return { data: { tree: { sha: "b".repeat(40) } } };
+          assert.equal(typeof commit_sha, "string");
+          return { data: { tree: { sha: "c".repeat(40) }, parents: [] } };
         },
-        getTree: async ({ tree_sha }) => {
+        getTree: async () => {
           calls.push(["ledger-tree"]);
-          assert.equal(tree_sha, "b".repeat(40));
-          const text = transactions.map(commit => canonical(commit)).join("\n") + "\n";
-          return { data: { truncated: false, tree: [{ path: "work-queue.jsonl", type: "blob", mode: "100644", sha: digest(text) }] } };
+          restBlobs.clear();
+          const files = [["work-queue.jsonl", transactions.map(commit => canonical(commit)).join("\n") + "\n"], ...[...journals].map(([file, value]) => [file, canonical(value) + "\n"])];
+          const tree = files.map(([file, content]) => {
+            const blobSha = digest({ file, content });
+            restBlobs.set(blobSha, content);
+            return { path: file, type: "blob", mode: "100644", sha: blobSha };
+          });
+          return { data: { truncated: false, tree } };
         },
         getBlob: async ({ file_sha }) => {
           calls.push(["ledger-blob"]);
-          const text = transactions.map(commit => canonical(commit)).join("\n") + "\n";
-          assert.equal(file_sha, digest(text));
-          return { data: { encoding: "base64", content: Buffer.from(text).toString("base64"), size: Buffer.byteLength(text) } };
+          const content = restBlobs.get(file_sha);
+          assert.equal(typeof content, "string");
+          return { data: { encoding: "base64", content: Buffer.from(content, "utf8").toString("base64"), size: Buffer.byteLength(content) } };
         },
         createRef: async ({ ref }) => {
           calls.push(["lock", ref]);

diff --git a/pkg/workflow/agy_engine_test.go b/pkg/workflow/agy_engine_test.go
@@ -358,7 +358,11 @@ func TestAgyConformanceEntryPointsShareConfiguration(t *testing.T) {
 	readConformanceFrontmatter(t, "../../.github/workflows/engine-conformance-agy.md", &canonical)
 	assert.Equal(t, map[string]any{"workflow_dispatch": nil}, canonical["on"])
 	assert.Equal(t, []any{"shared/agy-conformance.md", "shared/engine-conformance-worker.md"}, canonical["imports"])
-	assert.Equal(t, map[string]any{"work-queue": map[string]any{"worker": true, "require-assignment": true}}, canonical["tools"])
+	assert.Equal(t, map[string]any{
+		"work-queue": map[string]any{"worker": true, "require-assignment": true},
+	}, canonical["tools"])
+	canonical["imports"] = []any{"shared/agy-conformance.md"}
+	delete(canonical, "tools")
 	assert.EqualValues(t, 5, canonical["max-ai-credits"])
 	canonical["imports"] = []any{"shared/agy-conformance.md"}
 	delete(canonical, "tools")