@enterpriseai/cli 3.20.3 → 3.20.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enterpriseai/cli",
-  "version": "3.20.3",
+  "version": "3.20.4",
   "description": "EnterpriseAI CLI for app setup, validation, deployment readiness, and platform operations",
   "type": "module",
   "bin": {

package/resources/deploy/eai-app-template/.github/workflows/eai-app.yml

@@ -44,6 +44,12 @@ on:
       local_e2e_expires_at:
         description: Exact server-issued local dispatch expiry.
         required: false
+      local_e2e_template_commit_sha:
+        description: Exact server-pinned template SHA for a local CLI customer successor.
+        required: false
+      local_e2e_predecessor_operation_id:
+        description: Completed source operation recorded in the reviewed customer commit.
+        required: false
       publicapi_base_url:
         description: Deprecated alias for public_api_url; retained for compatibility.
         required: false
@@ -223,6 +229,8 @@ jobs:
           SOURCE_MODE: ${{ inputs.source_mode || 'source-unknown' }}
           LOCAL_E2E_TUNNEL: ${{ inputs.local_e2e_tunnel }}
           LOCAL_E2E_EXPIRES_AT: ${{ inputs.local_e2e_expires_at }}
+          LOCAL_E2E_TEMPLATE_COMMIT_SHA: ${{ inputs.local_e2e_template_commit_sha }}
+          LOCAL_E2E_PREDECESSOR_OPERATION_ID: ${{ inputs.local_e2e_predecessor_operation_id }}
           GITHUB_EVENT_NAME: ${{ github.event_name }}
           REUSABLE_CALL: ${{ inputs.eai_reusable_call }}
           REPOSITORY_ID: ${{ github.repository_id }}
@@ -244,6 +252,8 @@ jobs:
             --legacy-public-api-url "$LEGACY_PUBLIC_API_URL" \
             --local-e2e-tunnel "$LOCAL_E2E_TUNNEL" \
             --local-e2e-expires-at "$LOCAL_E2E_EXPIRES_AT" \
+            --local-e2e-template-commit-sha "$LOCAL_E2E_TEMPLATE_COMMIT_SHA" \
+            --local-e2e-predecessor-operation-id "$LOCAL_E2E_PREDECESSOR_OPERATION_ID" \
             --github-event-name "$GITHUB_EVENT_NAME" \
             --reusable-call "$REUSABLE_CALL" \
             --repository-id "$REPOSITORY_ID" \
@@ -351,6 +361,8 @@ jobs:
           EAI_BOUND_PUBLIC_API_URL: ${{ inputs.public_api_url || inputs.publicapi_base_url }}
           LOCAL_E2E_TUNNEL: ${{ inputs.local_e2e_tunnel }}
           LOCAL_E2E_EXPIRES_AT: ${{ inputs.local_e2e_expires_at }}
+          LOCAL_E2E_TEMPLATE_COMMIT_SHA: ${{ inputs.local_e2e_template_commit_sha }}
+          LOCAL_E2E_PREDECESSOR_OPERATION_ID: ${{ inputs.local_e2e_predecessor_operation_id }}
           GITHUB_EVENT_NAME: ${{ github.event_name }}
           REUSABLE_CALL: ${{ inputs.eai_reusable_call }}
           REPOSITORY_ID: ${{ github.repository_id }}
@@ -364,6 +376,8 @@ jobs:
             --public-api-url "$EAI_BOUND_PUBLIC_API_URL" \
             --local-e2e-tunnel "$LOCAL_E2E_TUNNEL" \
             --local-e2e-expires-at "$LOCAL_E2E_EXPIRES_AT" \
+            --local-e2e-template-commit-sha "$LOCAL_E2E_TEMPLATE_COMMIT_SHA" \
+            --local-e2e-predecessor-operation-id "$LOCAL_E2E_PREDECESSOR_OPERATION_ID" \
             --github-event-name "$GITHUB_EVENT_NAME" \
             --reusable-call "$REUSABLE_CALL" \
             --repository-id "$REPOSITORY_ID" \
@@ -437,6 +451,8 @@ jobs:
           SOURCE_MODE: ${{ inputs.source_mode || 'source-unknown' }}
           LOCAL_E2E_TUNNEL: ${{ inputs.local_e2e_tunnel }}
           LOCAL_E2E_EXPIRES_AT: ${{ inputs.local_e2e_expires_at }}
+          LOCAL_E2E_TEMPLATE_COMMIT_SHA: ${{ inputs.local_e2e_template_commit_sha }}
+          LOCAL_E2E_PREDECESSOR_OPERATION_ID: ${{ inputs.local_e2e_predecessor_operation_id }}
           GITHUB_EVENT_NAME: ${{ github.event_name }}
           REUSABLE_CALL: ${{ inputs.eai_reusable_call }}
           GITHUB_TOKEN: ${{ github.token }}
@@ -454,9 +470,13 @@ jobs:
             [[ ( "$SOURCE_MODE" == eai-cli-generated || "$SOURCE_MODE" == source-unknown ) && "$GITHUB_EVENT_NAME" == workflow_dispatch && "$REUSABLE_CALL" != true ]]
             [[ "$DEPLOY_ENVIRONMENT" == dev || "$DEPLOY_ENVIRONMENT" == preview ]]
             [[ "$EAI_BOUND_PUBLIC_API_URL" =~ ^https://[a-z0-9-]+-8000\.[a-z0-9-]+\.devtunnels\.ms$ ]]
+            if [[ -n "$LOCAL_E2E_PREDECESSOR_OPERATION_ID" ]]; then
+              [[ "$SOURCE_MODE" == eai-cli-generated && -n "$LOCAL_E2E_TEMPLATE_COMMIT_SHA" ]]
+            fi
           else
             [[ "$LOCAL_E2E_TUNNEL" == false || -z "$LOCAL_E2E_TUNNEL" ]]
             [[ -z "$LOCAL_E2E_EXPIRES_AT" ]]
+            [[ -z "$LOCAL_E2E_TEMPLATE_COMMIT_SHA" && -z "$LOCAL_E2E_PREDECESSOR_OPERATION_ID" ]]
             [[ "$EAI_BOUND_PUBLIC_API_URL" =~ ^https://(dev-api\.au|(test-api|api)\.(au|ca|eu))\.myenterprise\.ai/public/?$ ]]
           fi
           [[ "$APP_KEY" =~ ^[a-z][a-z0-9-]{1,62}$ ]]
@@ -813,6 +833,12 @@ jobs:
             if (!sourceUnknownLocal && !/^[a-f0-9]{40}$/.test(local.templateCommitSha)) {
               throw new Error('Build evidence local template binding changed.');
             }
+            if (sourceUnknownLocal
+              ? (process.env.LOCAL_E2E_TEMPLATE_COMMIT_SHA || process.env.LOCAL_E2E_PREDECESSOR_OPERATION_ID)
+              : (process.env.LOCAL_E2E_TEMPLATE_COMMIT_SHA &&
+                  local.templateCommitSha !== process.env.LOCAL_E2E_TEMPLATE_COMMIT_SHA)) {
+              throw new Error('Build evidence local successor binding changed.');
+            }
             const tuple = sourceUnknownLocal
               ? ['eai.source-unknown-local-e2e-aud.v1', local.origin, process.env.TENANT_ID,
                   process.env.TARGET_TENANT_ID || process.env.TENANT_ID, process.env.APP_KEY, evidence.operationId,
@@ -1014,7 +1040,37 @@ jobs:
           });
           NODE
 
+      - name: Check GitHub attestation availability
+        id: attestation-availability
+        env:
+          EXPECTED_REPOSITORY: ${{ github.repository }}
+          EXPECTED_REPOSITORY_ID: ${{ github.repository_id }}
+          EXPECTED_OWNER_ID: ${{ github.repository_owner_id }}
+        shell: bash
+        run: |
+          node - <<'NODE'
+          const { appendFileSync, readFileSync } = require('node:fs');
+          const event = JSON.parse(readFileSync(process.env.GITHUB_EVENT_PATH, 'utf8'));
+          const repository = event.repository;
+          const owner = repository?.owner;
+          if (!repository || !owner ||
+              !Number.isSafeInteger(repository.id) || repository.id < 1 ||
+              String(repository.id) !== process.env.EXPECTED_REPOSITORY_ID ||
+              repository.full_name !== process.env.EXPECTED_REPOSITORY ||
+              typeof repository.private !== 'boolean' ||
+              !Number.isSafeInteger(owner.id) || owner.id < 1 ||
+              String(owner.id) !== process.env.EXPECTED_OWNER_ID ||
+              !['User', 'Organization'].includes(owner.type) ||
+              owner.login !== process.env.EXPECTED_REPOSITORY.split('/')[0]) {
+            throw new Error('GitHub attestation availability requires exact provider repository metadata.');
+          }
+          // SECURITY: GitHub rejects attestations for personal-account private repositories; OIDC-bound artifact verification remains mandatory.
+          const available = !(repository.private && owner.type === 'User');
+          appendFileSync(process.env.GITHUB_OUTPUT, `available=${available}\n`);
+          NODE
+
       - name: Attest immutable image archive provenance
+        if: ${{ steps.attestation-availability.outputs.available == 'true' }}
         uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2
         with:
           subject-path: .eai-build/eai-generated-app-image.tar
@@ -1028,6 +1084,8 @@ jobs:
           SOURCE_MODE: ${{ inputs.source_mode || 'source-unknown' }}
           LOCAL_E2E_TUNNEL: ${{ inputs.local_e2e_tunnel }}
           LOCAL_E2E_EXPIRES_AT: ${{ inputs.local_e2e_expires_at }}
+          LOCAL_E2E_TEMPLATE_COMMIT_SHA: ${{ inputs.local_e2e_template_commit_sha }}
+          LOCAL_E2E_PREDECESSOR_OPERATION_ID: ${{ inputs.local_e2e_predecessor_operation_id }}
           DEPLOY_ENVIRONMENT: ${{ needs.build.outputs.deployment_environment }}
           GITHUB_EVENT_NAME: ${{ github.event_name }}
           REUSABLE_CALL: ${{ inputs.eai_reusable_call }}
@@ -1053,6 +1111,10 @@ jobs:
           const repoId = process.env.GITHUB_REPOSITORY_ID;
           const expiry = process.env.LOCAL_E2E_EXPIRES_AT;
           const sourceUnknownLocal = process.env.SOURCE_MODE === 'source-unknown';
+          if (sourceUnknownLocal
+            ? (process.env.LOCAL_E2E_TEMPLATE_COMMIT_SHA || process.env.LOCAL_E2E_PREDECESSOR_OPERATION_ID)
+            : (process.env.LOCAL_E2E_TEMPLATE_COMMIT_SHA &&
+                local?.templateCommitSha !== process.env.LOCAL_E2E_TEMPLATE_COMMIT_SHA)) process.exit(1);
           const expectedKeys = sourceUnknownLocal
             ? 'audience,expiresAt,mode,nonceDigest,origin'
             : 'audience,expiresAt,mode,origin,templateCommitSha';

package/resources/deploy/eai-app-template/producer-pin.json

@@ -2,28 +2,28 @@
   "schemaVersion": "eai.managed-deploy-producer-pin.v1",
   "repository": "eai-support/eai-app-template",
   "candidate": {
-    "commit": "c8a8aed26c4d159a4fa2598d9b5e8a495203dd8b",
+    "commit": "3162df8dffd36465ef2cec474eee4f8e6285ec3c",
     "workflow": {
       "path": ".github/workflows/eai-app.yml",
-      "sha256": "sha256:bce4e34fe5c47377e6a679966a37257d944cd00ccf3c15b4ba437f144ed559ed"
+      "sha256": "sha256:74ede3c4e1de12fa5f63135349e61365bd845443dbb4dbe51573d8c490baa1d5"
     },
     "collector": {
       "path": "scripts/source-unknown-deployment-evidence.mjs",
-      "sha256": "sha256:06e7f33bf1db1d7adbebb75a76d2756e46371318f36d2518c5cfbb58ad4f5e1c"
+      "sha256": "sha256:f20a4291b03b6f877ebaa9bdba9c2c2a839225d181c23b8be19a617a25536dc6"
     },
     "evidenceTest": {
       "path": "tests/source-unknown-deployment-evidence.test.mjs",
-      "sha256": "sha256:fe5f8381d882ac39656b67b30e1e18193cb676a8aba26a6776a88880a3bb5827"
+      "sha256": "sha256:75140ba332d49d364f1f2792267aabcc9c50ed7a38a76e6e1702955ebd4e99f7"
     }
   },
   "releaseGate": {
     "status": "released",
-    "tag": "v1.0.14",
-    "commit": "c8a8aed26c4d159a4fa2598d9b5e8a495203dd8b"
+    "tag": "v1.0.17",
+    "commit": "3162df8dffd36465ef2cec474eee4f8e6285ec3c"
   },
   "githubProducerIdentity": {
     "profile": "github-environment-v1",
-    "templateCommitSha": "c8a8aed26c4d159a4fa2598d9b5e8a495203dd8b",
-    "workflowSha256": "sha256:bce4e34fe5c47377e6a679966a37257d944cd00ccf3c15b4ba437f144ed559ed"
+    "templateCommitSha": "3162df8dffd36465ef2cec474eee4f8e6285ec3c",
+    "workflowSha256": "sha256:74ede3c4e1de12fa5f63135349e61365bd845443dbb4dbe51573d8c490baa1d5"
   }
 }

package/resources/deploy/eai-app-template/scripts/source-unknown-deployment-evidence.mjs

@@ -173,7 +173,10 @@ function validateDeploymentBinding(options, mode) {
 function localE2eBinding(options, mode, environment, root) {
   const flag = option(options, 'localE2eTunnel');
   const expiresAt = option(options, 'localE2eExpiresAt');
-  if (!['', 'false', 'true'].includes(flag) || (flag !== 'true' && expiresAt)) {
+  const serverTemplateCommitSha = option(options, 'localE2eTemplateCommitSha');
+  const predecessorOperationId = option(options, 'localE2ePredecessorOperationId');
+  if (!['', 'false', 'true'].includes(flag) ||
+    (flag !== 'true' && (expiresAt || serverTemplateCommitSha || predecessorOperationId))) {
     throw new Error('Local deployment inputs conflict.');
   }
   if (flag !== 'true') return null;
@@ -181,6 +184,7 @@ function localE2eBinding(options, mode, environment, root) {
   const operationId = option(options, 'operationId');
   const repositoryId = option(options, 'repositoryId');
   if (
+    (mode !== 'eai-cli-generated' && (serverTemplateCommitSha || predecessorOperationId)) ||
     !['eai-cli-generated', 'source-unknown'].includes(mode) ||
     !['preview', 'dev'].includes(environment) ||
     option(options, 'githubEventName') !== 'workflow_dispatch' ||
@@ -224,21 +228,39 @@ function localE2eBinding(options, mode, environment, root) {
   if (!/^cli-managed-[a-f0-9]{32}$/.test(operationId)) {
     throw new Error('Local CLI operation binding is invalid.');
   }
+  if ((serverTemplateCommitSha && !/^[a-f0-9]{40}$/.test(serverTemplateCommitSha)) ||
+    (predecessorOperationId && (!/^cli-managed-[a-f0-9]{32}$/.test(predecessorOperationId) ||
+      predecessorOperationId === operationId || !serverTemplateCommitSha))) {
+    throw new Error('Local CLI successor binding is invalid.');
+  }
   const binding = JSON.parse(readRegularFileNoFollow(root, '.eai/cli-managed-source-operation.json').toString('utf8'));
   if (
     binding.schemaVersion !== 'eai.cli_managed_source_operation.v1' ||
     binding.sourceMode !== mode ||
-    binding.operationId !== operationId ||
+    (predecessorOperationId
+      ? (binding.predecessor?.operationId !== predecessorOperationId ||
+        !/^cli-managed-[a-f0-9]{32}$/.test(binding.operationId || '') ||
+        binding.operationId === operationId)
+      : binding.operationId !== operationId) ||
+    binding.tenantId !== option(options, 'tenantId') ||
+    binding.appKey !== option(options, 'appKey') ||
+    binding.targetTenantId !== option(options, 'targetTenantId') ||
     binding.environment !== environment ||
     binding.templateCommitSha?.match(/^[a-f0-9]{40}$/) === null ||
-    !/^[a-f0-9]{40}$/.test(binding.templateCommitSha || '')
+    !/^[a-f0-9]{40}$/.test(binding.templateCommitSha || '') ||
+    (predecessorOperationId && binding.repositoryAuthority !== 'customer-owned') ||
+    (!predecessorOperationId && binding.repositoryAuthority === 'customer-owned') ||
+    (!predecessorOperationId && serverTemplateCommitSha &&
+      binding.templateCommitSha !== serverTemplateCommitSha)
   ) {
     throw new Error('Local deployment original source binding is invalid.');
   }
-  const tuple = ['eai.cli-managed-local-e2e-aud.v1', origin, operationId, repositoryId, binding.templateCommitSha, expiresAt];
+  // SECURITY: the committed marker is historical for customer successors; the server pins the current template in its OIDC audience.
+  const templateCommitSha = serverTemplateCommitSha || binding.templateCommitSha;
+  const tuple = ['eai.cli-managed-local-e2e-aud.v1', origin, operationId, repositoryId, templateCommitSha, expiresAt];
   return {
     mode: 'local-tunnel-v1', origin, expiresAt,
-    templateCommitSha: binding.templateCommitSha,
+    templateCommitSha,
     audience: LOCAL_E2E_AUDIENCE_PREFIX + createHash('sha256').update(JSON.stringify(tuple)).digest('hex'),
   };
 }

package/resources/deploy/eai-app-template/tests/source-unknown-deployment-evidence.test.mjs

@@ -32,6 +32,8 @@ const canonicalWorkflowRelativePath = '.github/workflows/eai-app.yml';
 const fixtureDirectory = 'tests/fixtures/source-unknown';
 const canonicalDigest =
   'bce4e34fe5c47377e6a679966a37257d944cd00ccf3c15b4ba437f144ed559ed';
+const currentWorkflowDigest =
+  '74ede3c4e1de12fa5f63135349e61365bd845443dbb4dbe51573d8c490baa1d5';
 const generatedDigest =
   '77d4951b3e6852ead73cef8b9e8901e3de774f9aca70f71cc0c932c13903ff32';
 const digest = (bytes) => createHash('sha256').update(bytes).digest('hex');
@@ -749,7 +751,7 @@ function resolveDeploymentWorkflowContext(
   if (!existsSync(manifestPath)) {
     assert.equal(
       digest(actual),
-      canonicalDigest,
+      currentWorkflowDigest,
       'Template workflow must retain the pinned canonical digest.',
     );
     return {
@@ -762,7 +764,7 @@ function resolveDeploymentWorkflowContext(
     validateCliManifest(manifest);
     assert.equal(
       digest(actual),
-      canonicalDigest,
+      currentWorkflowDigest,
       'CLI workflow must retain the pinned canonical digest.',
     );
     return {
@@ -1616,6 +1618,77 @@ test('workflow sends OIDC evidence directly to the canonical PublicAPI route', (
   }
 });
 
+test('GitHub attestation availability is exact and leaves signed handoff required', () => {
+  const workflow = readFileSync(workflowPath, 'utf8');
+  const decision = workflow.match(
+    /- name: Check GitHub attestation availability[\s\S]*?run: \|\n          node - <<'NODE'\n([\s\S]*?)\n          NODE/,
+  );
+  assert.ok(decision);
+  const script = decision[1].replace(/^ {10}/gm, '');
+  assert.match(
+    workflow,
+    /- name: Attest immutable image archive provenance\n        if: \$\{\{ steps\.attestation-availability\.outputs\.available == 'true' \}\}/,
+  );
+  assert.match(
+    workflow,
+    /- name: Request GitHub OIDC token and submit workflow evidence\n        env:/,
+  );
+  const directory = mkdtempSync(join(tmpdir(), 'eai-attestation-availability-'));
+  const eventPath = join(directory, 'event.json');
+  const outputPath = join(directory, 'output');
+  const repository = {
+    id: 1414837259,
+    full_name: 'customer/app',
+    private: true,
+    owner: { id: 332652381, login: 'customer', type: 'User' },
+  };
+  const check = (candidate) => {
+    writeFileSync(eventPath, JSON.stringify({ repository: candidate }));
+    writeFileSync(outputPath, '');
+    const result = spawnSync(process.execPath, ['-'], {
+      input: script,
+      encoding: 'utf8',
+      env: {
+        ...process.env,
+        GITHUB_EVENT_PATH: eventPath,
+        GITHUB_OUTPUT: outputPath,
+        EXPECTED_REPOSITORY: 'customer/app',
+        EXPECTED_REPOSITORY_ID: '1414837259',
+        EXPECTED_OWNER_ID: '332652381',
+      },
+    });
+    return { result, output: readFileSync(outputPath, 'utf8') };
+  };
+  try {
+    const personalPrivate = check(repository);
+    assert.equal(personalPrivate.result.status, 0, personalPrivate.result.stderr);
+    assert.equal(personalPrivate.output, 'available=false\n');
+    for (const supported of [
+      { ...repository, private: false },
+      { ...repository, owner: { ...repository.owner, type: 'Organization' } },
+    ]) {
+      const outcome = check(supported);
+      assert.equal(outcome.result.status, 0, outcome.result.stderr);
+      assert.equal(outcome.output, 'available=true\n');
+    }
+    for (const invalid of [
+      { ...repository, private: undefined },
+      { ...repository, private: 'true' },
+      { ...repository, id: 3 },
+      { ...repository, full_name: 'other/app' },
+      { ...repository, owner: { ...repository.owner, type: undefined } },
+      { ...repository, owner: { ...repository.owner, id: 3 } },
+      { ...repository, owner: { ...repository.owner, login: 'other' } },
+    ]) {
+      const outcome = check(invalid);
+      assert.notEqual(outcome.result.status, 0);
+      assert.equal(outcome.output, '');
+    }
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+});
+
 test('reusable workflow compatibility keeps manual same-repository OIDC authority', () => {
   const workflow = readFileSync(workflowPath, 'utf8');
   const readme = readFileSync(readmePath, 'utf8');
@@ -1703,6 +1776,8 @@ test('local CLI dispatch binds direct DEV tunnel, original template and numeric
     writeFileSync(join(root, '.eai/cli-managed-source-operation.json'), JSON.stringify({
       schemaVersion: 'eai.cli_managed_source_operation.v1',
       sourceMode: 'eai-cli-generated', operationId, environment: 'dev',
+      tenantId: 'tenant-parent', targetTenantId: 'hosting-tenant', appKey: 'rates-review',
+      repositoryAuthority: 'eai-managed',
       templateCommitSha: 'b'.repeat(40),
     }));
     execFileSync('git', ['init', '-q'], { cwd: root });
@@ -1720,6 +1795,68 @@ test('local CLI dispatch binds direct DEV tunnel, original template and numeric
       '--local-e2e-expires-at', expiry, '--github-event-name', 'workflow_dispatch',
       '--reusable-call', 'false', '--repository-id', '12345'];
     runEvidenceScript(args);
+    writeFileSync(join(root, '.eai/cli-managed-source-operation.json'), JSON.stringify({
+      schemaVersion: 'eai.cli_managed_source_operation.v1', sourceMode: 'eai-cli-generated',
+      operationId, environment: 'dev', tenantId: 'tenant-parent', targetTenantId: 'hosting-tenant',
+      appKey: 'rates-review', repositoryAuthority: 'customer-owned', templateCommitSha: 'b'.repeat(40),
+    }));
+    assert.equal(spawnSync(process.execPath, [evidenceScript, ...args], { encoding: 'utf8' }).status, 1);
+    writeFileSync(join(root, '.eai/cli-managed-source-operation.json'), JSON.stringify({
+      schemaVersion: 'eai.cli_managed_source_operation.v1', sourceMode: 'eai-cli-generated',
+      operationId, environment: 'dev', tenantId: 'tenant-parent', targetTenantId: 'hosting-tenant',
+      appKey: 'rates-review', repositoryAuthority: 'eai-managed', templateCommitSha: 'b'.repeat(40),
+    }));
+    const sameTemplate = [...args, '--local-e2e-template-commit-sha', 'b'.repeat(40)];
+    runEvidenceScript(sameTemplate);
+    const wrongInitialTemplate = [...args, '--local-e2e-template-commit-sha', 'd'.repeat(40)];
+    assert.equal(spawnSync(process.execPath, [evidenceScript, ...wrongInitialTemplate], { encoding: 'utf8' }).status, 1);
+    const predecessorOperationId = `cli-managed-${'e'.repeat(32)}`;
+    const historicalOperationId = `cli-managed-${'9'.repeat(32)}`;
+    const successorMarker = {
+      schemaVersion: 'eai.cli_managed_source_operation.v1',
+      sourceMode: 'eai-cli-generated', operationId: historicalOperationId, environment: 'dev',
+      tenantId: 'tenant-parent', targetTenantId: 'hosting-tenant', appKey: 'rates-review',
+      repositoryAuthority: 'customer-owned', templateCommitSha: 'b'.repeat(40),
+      predecessor: { operationId: predecessorOperationId },
+    };
+    const markerPath = join(root, '.eai/cli-managed-source-operation.json');
+    writeFileSync(markerPath, JSON.stringify(successorMarker));
+    const successor = [...args,
+      '--local-e2e-template-commit-sha', 'd'.repeat(40),
+      '--local-e2e-predecessor-operation-id', predecessorOperationId];
+    runEvidenceScript(successor);
+    runEvidenceScript(['collect', ...successor.slice(1),
+      '--repo', 'customer/rates-review', '--workflow', '.github/workflows/eai-app.yml',
+      '--ref', 'refs/heads/main', '--branch', 'main', '--workflow-run-id', '123456789',
+      '--workflow-run-attempt', '1', '--artifact-id', '987654321',
+      '--artifact-digest', `sha256:${'d'.repeat(64)}`, '--image-digest', `sha256:${'c'.repeat(64)}`]);
+    const collected = JSON.parse(readFileSync(join(root,
+      '.eai-build/evidence/source-unknown-deployment-evidence.json'), 'utf8'));
+    const successorTuple = ['eai.cli-managed-local-e2e-aud.v1',
+      'https://careful-8000.eai.devtunnels.ms', operationId, '12345', 'd'.repeat(40), expiry];
+    assert.equal(collected.localE2e.templateCommitSha, 'd'.repeat(40));
+    assert.equal(collected.localE2e.audience,
+      'api://enterprise-ai-publicapi/eai-cli-generated/local-v1/' + digest(JSON.stringify(successorTuple)));
+    writeFileSync(markerPath, JSON.stringify({ ...successorMarker,
+      predecessor: { operationId: `cli-managed-${'f'.repeat(32)}` } }));
+    assert.equal(spawnSync(process.execPath, [evidenceScript, ...successor], { encoding: 'utf8' }).status, 1);
+    writeFileSync(markerPath, JSON.stringify({ ...successorMarker, repositoryAuthority: 'eai-managed' }));
+    assert.equal(spawnSync(process.execPath, [evidenceScript, ...successor], { encoding: 'utf8' }).status, 1);
+    writeFileSync(markerPath, JSON.stringify(successorMarker));
+    for (const mutated of [
+      [...args],
+      [...successor.slice(0, -1), `cli-managed-${'f'.repeat(32)}`],
+      [...args, '--local-e2e-predecessor-operation-id', predecessorOperationId],
+      [...successor.slice(0, -3), 'not-a-sha', ...successor.slice(-2)],
+    ]) {
+      assert.equal(spawnSync(process.execPath, [evidenceScript, ...mutated], { encoding: 'utf8' }).status, 1);
+    }
+    const wrongScope = [...successor];
+    wrongScope[wrongScope.indexOf('--tenant-id') + 1] = 'another-tenant';
+    assert.equal(spawnSync(process.execPath, [evidenceScript, ...wrongScope], { encoding: 'utf8' }).status, 1);
+    const wrongRepository = [...successor];
+    wrongRepository[wrongRepository.indexOf('--repository-id') + 1] = '0';
+    assert.equal(spawnSync(process.execPath, [evidenceScript, ...wrongRepository], { encoding: 'utf8' }).status, 1);
     for (const [key, value] of [
       ['--public-api-url', 'https://attacker.example'],
       ['--environment', 'test'],
@@ -1742,12 +1879,44 @@ test('local CLI dispatch binds direct DEV tunnel, original template and numeric
     const reusableInputs = workflow.slice(workflow.indexOf('  workflow_call:'), workflow.indexOf('\npermissions:'));
     assert.match(directInputs, /local_e2e_tunnel:/);
     assert.match(directInputs, /local_e2e_expires_at:/);
-    assert.doesNotMatch(reusableInputs, /local_e2e_tunnel:|local_e2e_expires_at:/);
+    assert.match(directInputs, /local_e2e_template_commit_sha:/);
+    assert.match(directInputs, /local_e2e_predecessor_operation_id:/);
+    assert.doesNotMatch(reusableInputs, /local_e2e_tunnel:|local_e2e_expires_at:|local_e2e_template_commit_sha:|local_e2e_predecessor_operation_id:/);
   } finally {
     rmSync(root, { recursive: true, force: true });
   }
 });
 
+test('build and OIDC workflow stages enforce the same server-pinned successor template', () => {
+  const workflow = readFileSync(workflowPath, 'utf8');
+  const buildError = workflow.indexOf("throw new Error('Build evidence local successor binding changed.');");
+  const buildStart = workflow.lastIndexOf('if (sourceUnknownLocal', buildError);
+  const buildEnd = workflow.indexOf('\n            const tuple =', buildError);
+  const oidcStep = workflow.indexOf('name: Request GitHub OIDC token and submit workflow evidence');
+  const oidcStart = workflow.indexOf('if (sourceUnknownLocal\n', oidcStep);
+  const oidcEnd = workflow.indexOf('\n          const expectedKeys', oidcStart);
+  assert.ok(buildError > 0 && buildStart > 0 && buildEnd > buildError);
+  assert.ok(oidcStep > 0 && oidcStart > oidcStep && oidcEnd > oidcStart);
+  for (const guard of [workflow.slice(buildStart, buildEnd), workflow.slice(oidcStart, oidcEnd)]) {
+    const runGuard = (sourceUnknownLocal, localSha, serverSha, predecessorId = '') => runInNewContext(guard, {
+      sourceUnknownLocal,
+      local: { templateCommitSha: localSha },
+      process: {
+        env: {
+          LOCAL_E2E_TEMPLATE_COMMIT_SHA: serverSha,
+          LOCAL_E2E_PREDECESSOR_OPERATION_ID: predecessorId,
+        },
+        exit(code) { throw new Error(`exit ${code}`); },
+      },
+    });
+    assert.doesNotThrow(() => runGuard(false, 'a'.repeat(40), 'a'.repeat(40), `cli-managed-${'b'.repeat(32)}`));
+    assert.throws(() => runGuard(false, 'a'.repeat(40), 'c'.repeat(40), `cli-managed-${'b'.repeat(32)}`));
+    assert.doesNotThrow(() => runGuard(false, 'a'.repeat(40), ''));
+    assert.throws(() => runGuard(true, 'a'.repeat(40), 'c'.repeat(40)));
+    assert.throws(() => runGuard(true, 'a'.repeat(40), '', `cli-managed-${'b'.repeat(32)}`));
+  }
+});
+
 test('local customer-owned source uses its own exact direct-operation audience', () => {
   const root = mkdtempSync(join(tmpdir(), 'eai-source-unknown-local-dispatch-'));
   try {
@@ -1768,6 +1937,12 @@ test('local customer-owned source uses its own exact direct-operation audience',
       '--github-event-name', 'workflow_dispatch', '--reusable-call', 'false',
       '--repository-id', '12345'];
     runEvidenceScript(args);
+    for (const extra of [
+      ['--local-e2e-template-commit-sha', 'd'.repeat(40)],
+      ['--local-e2e-predecessor-operation-id', `cli-managed-${'e'.repeat(32)}`],
+    ]) {
+      assert.equal(spawnSync(process.execPath, [evidenceScript, ...args, ...extra], { encoding: 'utf8' }).status, 1);
+    }
     const withoutTarget = [...args];
     withoutTarget.splice(withoutTarget.indexOf('--target-tenant-id'), 2);
     runEvidenceScript(withoutTarget);
@@ -5583,6 +5758,9 @@ syncBuiltinESMExports();
 const root = repoRoot;
 const fixtures = join(root, 'tests/fixtures/source-unknown');
 const canonical = regularBytes(workflowPath);
+const legacyCanonical = existsSync(join(fixtures, 'eai-app.yml'))
+  ? regularBytes(join(fixtures, 'eai-app.yml'))
+  : canonical;
 // INVARIANT: synthetic controlled input stays inline so legacy four-file repairs execute every control without new fixture dependencies.
 const generated = gunzipSync(
   Buffer.from(
@@ -5654,7 +5832,7 @@ function contextFixture(t, manifest, workflow = canonical, operation) {
   mkdirSync(join(directory, '.github/workflows'), { recursive: true });
   mkdirSync(join(directory, 'tests/fixtures'), { recursive: true });
   mkdirSync(join(directory, fixtureDirectory), { recursive: true });
-  writeFileSync(join(directory, fixtureDirectory, 'eai-app.yml'), canonical);
+  writeFileSync(join(directory, fixtureDirectory, 'eai-app.yml'), legacyCanonical);
   writeFileSync(
     join(directory, fixtureDirectory, 'generated-eai-app.yml'),
     generated,
@@ -6007,7 +6185,7 @@ test('generated contract fixture drift fails before comparison', () => {
 test('inline synthetic generated input retains repository and actual normalized export parity', () => {
   assert.equal(digest(generated), generatedDigest);
   if (existsSync(fixtures)) {
-    assert.ok(regularBytes(join(fixtures, 'eai-app.yml')).equals(canonical));
+    assert.equal(digest(regularBytes(join(fixtures, 'eai-app.yml'))), canonicalDigest);
     assert.ok(
       regularBytes(join(fixtures, 'generated-eai-app.yml')).equals(generated),
     );
@@ -6023,7 +6201,7 @@ test('inline synthetic generated input retains repository and actual normalized
     );
     assert.equal(
       digest(regularBytes(join(root, canonicalWorkflowRelativePath))),
-      canonicalDigest,
+      currentWorkflowDigest,
     );
   }
 });

package/resources/linked-sources.json

@@ -7,8 +7,8 @@
   },
   "appTemplate": {
     "repo": "https://github.com/eai-support/eai-app-template.git",
-    "version": "v1.0.14",
-    "commit": "c8a8aed26c4d159a4fa2598d9b5e8a495203dd8b",
+    "version": "v1.0.17",
+    "commit": "3162df8dffd36465ef2cec474eee4f8e6285ec3c",
     "packageLockSha256": "5b04e0be44ef93a817e4dc5076914d0f0684712b41155ee2934ce42f184df415",
     "enterpriseRegistry": "https://enterpriseaigroup.github.io/enterpriseai-packages/registry",
     "enterprisePackageFingerprint": "3286fdf91d6a25a55a4d84de21bf5c592bcf11abffb96dc2be90e93414eeb646",