Skip to content

fix: restore AI-Assisted Setup agent prompt lost in merge - #3

Open
harmjeff wants to merge 1 commit into
mainfrom
fix/restore-agent-setup-instructions
Open

fix: restore AI-Assisted Setup agent prompt lost in merge#3
harmjeff wants to merge 1 commit into
mainfrom
fix/restore-agent-setup-instructions

Conversation

@harmjeff

@harmjeff harmjeff commented Jun 1, 2026

Copy link
Copy Markdown
Owner

Summary

  • Restores the agent prompt body under the "Experimental: AI-Assisted Setup (Release Download)" section, which was lost during a merge conflict resolution
  • The section header survived the merge but its content (the copyable agent prompt, download steps, IDE-specific file mapping, and update instructions) was dropped and replaced by the Additional Resources table
  • Content is restored verbatim from upstream/main (originally added by feat: agent-driven setup — drop the manual steps awslabs/aidlc-workflows#109)

What happened

When merging feat/design-reviewer-improvements into main and then reconciling with origin/main, git auto-merged README.md without conflict markers. The merge silently dropped the prompt body and ran the Additional Resources table directly under the Experimental section header.

Testing

  • Verified restored content matches upstream/main exactly
  • Confirmed Additional Resources table remains intact below the restored section
  • No other sections affected

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the project license.

@github-actions github-actions Bot added the documentation Improvements or additions to documentation label Jun 1, 2026
The body of the Experimental: AI-Assisted Setup section was dropped
during the merge conflict resolution — the header survived but the
prompt content merged into the Additional Resources table. Restores
the content verbatim from upstream/main (added by PR awslabs#109).

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
@harmjeff
harmjeff force-pushed the fix/restore-agent-setup-instructions branch from 59e5dd9 to 5904f3b Compare June 3, 2026 13:58
harmjeff added a commit that referenced this pull request Jul 6, 2026
…en packager, bump 2.3.0

Compose hook (review #1/#2/awslabs#6/awslabs#7/awslabs#10/awslabs#11/awslabs#12): fold compose.sh +
compose-contributions.ts + compose-fragments.ts into a single portable
compose.ts (bun). Removes the shell-portability bug class — GNU-only
`sed -i` → replaceAll, BSD/coreutils>=9.2 `cp -rn` clobber → existsSync
no-clobber guard, swallowed `2>/dev/null || true` → recordDrop to
aidlc/.aidlc-hooks-health/plugin-compose.drops. Anchors validated +
escaped (skip-with-log, never a thrown regex); splices idempotent via
sentinel markers; compare-before-write; recompile only when changed.

Packager (review #3/#4): emit the kiro-ide projection too (four harness
trees now); `--check` byte-parity drift-guards dist/plugins/ (verified it
catches a tampered projection file).

Compose read half (review awslabs#5/awslabs#8): handle the inline-empty `field: []`
form; normalize CRLF once so every block/list regex is newline-safe.

Docs (awslabs#9/awslabs#13): README repo-layout adds plugins/ + dist/plugins/;
doc 18 gets a Kiro folder-drop security note (no install-time trust gate)
and drops stale two-helper / three-host references.

Also: remove spikes/dist-probe/ from the PR; bump 2.2.0 → 2.3.0
(version.ts + README badge + CHANGELOG); update t188 for compose.ts +
the four-harness projection set.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
harmjeff added a commit that referenced this pull request Jul 7, 2026
…en packager, bump 2.3.0

Compose hook (review #1/#2/awslabs#6/awslabs#7/awslabs#10/awslabs#11/awslabs#12): fold compose.sh +
compose-contributions.ts + compose-fragments.ts into a single portable
compose.ts (bun). Removes the shell-portability bug class — GNU-only
`sed -i` → replaceAll, BSD/coreutils>=9.2 `cp -rn` clobber → existsSync
no-clobber guard, swallowed `2>/dev/null || true` → recordDrop to
aidlc/.aidlc-hooks-health/plugin-compose.drops. Anchors validated +
escaped (skip-with-log, never a thrown regex); splices idempotent via
sentinel markers; compare-before-write; recompile only when changed.

Packager (review #3/#4): emit the kiro-ide projection too (four harness
trees now); `--check` byte-parity drift-guards dist/plugins/ (verified it
catches a tampered projection file).

Compose read half (review awslabs#5/awslabs#8): handle the inline-empty `field: []`
form; normalize CRLF once so every block/list regex is newline-safe.

Docs (awslabs#9/awslabs#13): README repo-layout adds plugins/ + dist/plugins/;
doc 18 gets a Kiro folder-drop security note (no install-time trust gate)
and drops stale two-helper / three-host references.

Also: remove spikes/dist-probe/ from the PR; bump 2.2.0 → 2.3.0
(version.ts + README badge + CHANGELOG); update t188 for compose.ts +
the four-harness projection set.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
harmjeff added a commit that referenced this pull request Jul 8, 2026
…en packager, bump 2.3.0

Compose hook (review #1/#2/awslabs#6/awslabs#7/awslabs#10/awslabs#11/awslabs#12): fold compose.sh +
compose-contributions.ts + compose-fragments.ts into a single portable
compose.ts (bun). Removes the shell-portability bug class — GNU-only
`sed -i` → replaceAll, BSD/coreutils>=9.2 `cp -rn` clobber → existsSync
no-clobber guard, swallowed `2>/dev/null || true` → recordDrop to
aidlc/.aidlc-hooks-health/plugin-compose.drops. Anchors validated +
escaped (skip-with-log, never a thrown regex); splices idempotent via
sentinel markers; compare-before-write; recompile only when changed.

Packager (review #3/#4): emit the kiro-ide projection too (four harness
trees now); `--check` byte-parity drift-guards dist/plugins/ (verified it
catches a tampered projection file).

Compose read half (review awslabs#5/awslabs#8): handle the inline-empty `field: []`
form; normalize CRLF once so every block/list regex is newline-safe.

Docs (awslabs#9/awslabs#13): README repo-layout adds plugins/ + dist/plugins/;
doc 18 gets a Kiro folder-drop security note (no install-time trust gate)
and drops stale two-helper / three-host references.

Also: remove spikes/dist-probe/ from the PR; bump 2.2.0 → 2.3.0
(version.ts + README badge + CHANGELOG); update t188 for compose.ts +
the four-harness projection set.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant