fix: convert #subdirectory= fragment to path component for local path… by johannao76 · Pull Request #163 · microsoft/amplifier-app-cli

johannao76 · 2026-04-20T16:55:54Z

When _build_include_source_resolver fires and the override is a local filesystem path (not a git+https:// or other URL), the #subdirectory=foo/bar fragment from the original git URL is meaningless as a file path. The file loader tries to open the literal string including #subdirectory=, fails to find it, and throws 'File not found'.

Fix: detect when override is a local path, and convert #subdirectory=behaviors/foo.yaml -> /behaviors/foo.yaml instead of appending it as a URL fragment.

Reproducer: amplifier source add superpowers ~/src/amplifier-bundle-superpowers then start an amplifier session.

Error:

… overrides When _build_include_source_resolver fires and the override is a local filesystem path (not a git+https:// or other URL), the #subdirectory=foo/bar fragment from the original git URL is meaningless as a file path. The file loader tries to open the literal string including #subdirectory=, fails to find it, and throws 'File not found'. Fix: detect when override is a local path, and convert #subdirectory=behaviors/foo.yaml -> /behaviors/foo.yaml instead of appending it as a URL fragment. Reproducer: amplifier source add superpowers ~/src/amplifier-bundle-superpowers then start a session that includes superpowers-methodology.yaml via git URL.

Adds scripts/smoke-test.sh to test the fix for #subdirectory= fragment handling in _build_include_source_resolver. The script: - Launches a clean Docker container with amplifier installed - Overrides amplifier-app-cli with the local checkout - Runs 4 unit tests for the resolver fix - Runs a session smoke test end-to-end All tests passing.

Copilot

Pull request overview

This PR fixes bundle include source overrides so that when an override is a local filesystem path, any #subdirectory=... fragment from the original git URL is converted into a path component (instead of being appended as a literal fragment that breaks file loading).

Changes:

Update _build_include_source_resolver to translate #subdirectory=... into /<subdirectory> for local path overrides.
Add a Docker-based smoke test script that installs Amplifier, overrides amplifier-app-cli with the local checkout, runs targeted checks, and performs a short session run.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 7 comments.

File	Description
`amplifier_app_cli/lib/bundle_loader/prepare.py`	Adjusts include override resolution to convert `#subdirectory=` into a local path segment.
`scripts/smoke-test.sh`	Adds a containerized smoke test workflow to validate the fix and run a basic session.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-20T23:35:45Z

+                    is_local = not (override.startswith("git+") or "://" in override)
+                    if is_local and fragment.startswith("subdirectory="):
+                        subdir = fragment.removeprefix("subdirectory=")
+                        return f"{override}/{subdir}"
                    return f"{override}#{fragment}"


This behavior change will break the existing pytest coverage for _build_include_source_resolver (e.g. the local-path fragment preservation assertion). Please update/add unit tests under tests/lib/bundle_loader/test_prepare.py to reflect the new local-path #subdirectory= conversion (the new smoke-test script won’t help CI).

Copilot · 2026-04-20T23:35:46Z

+docker exec "$CONTAINER_NAME" bash -c "
+    apt-get update -qq && apt-get install -y -qq git >/dev/null 2>&1
+    pip install -q uv
+    echo 'Bootstrap OK'
+" || fail "Bootstrap failed"


The commands executed inside the container don’t enable set -e/pipefail, so failures in apt-get/pip install can be masked (the last echo still succeeds). Add strict mode inside the bash -c script (or chain with &&) so the smoke test reliably fails when bootstrap fails.

Copilot · 2026-04-20T23:35:46Z

+    export PATH=/root/.local/bin:\$PATH
+    uv tool install git+https://github.com/microsoft/amplifier@main 2>&1 | tail -3


uv tool install ... | tail -3 can hide errors (and without pipefail the pipeline can still exit 0). Prefer keeping full output or explicitly checking the install command’s exit status; at minimum enable set -o pipefail in the container command.

Suggested change

export PATH=/root/.local/bin:\$PATH

uv tool install git+https://github.com/microsoft/amplifier@main 2>&1 | tail -3

set -euo pipefail

export PATH=/root/.local/bin:\$PATH

uv tool install git+https://github.com/microsoft/amplifier@main

Copilot · 2026-04-20T23:35:46Z

+SMOKE_OUTPUT=$(docker exec "$CONTAINER_NAME" bash -c "
+    export PATH=/root/.local/bin:\$PATH
+    timeout 120 amplifier run '$SMOKE_PROMPT' 2>&1
+") || SMOKE_EXIT=$?


timeout 120 amplifier run '$SMOKE_PROMPT' is vulnerable to quoting/injection issues if SMOKE_PROMPT contains a single quote (or shell metacharacters). Pass the prompt into the container via an env var and use proper shell escaping/"$SMOKE_PROMPT" inside the container, or avoid bash -c and pass args directly to docker exec.

Suggested change

SMOKE_OUTPUT=$(docker exec "$CONTAINER_NAME" bash -c "

export PATH=/root/.local/bin:\$PATH

timeout 120 amplifier run '$SMOKE_PROMPT' 2>&1

") || SMOKE_EXIT=$?

SMOKE_OUTPUT=$(docker exec \

-e SMOKE_PROMPT="$SMOKE_PROMPT" \

"$CONTAINER_NAME" \

bash -c '

export PATH=/root/.local/bin:$PATH

timeout 120 amplifier run "$SMOKE_PROMPT" 2>&1

') || SMOKE_EXIT=$?

Copilot · 2026-04-20T23:35:46Z

        # -> "/local/path/superpowers"

-        # Fragment preservation:
+        # Fragment preservation — git URL override keeps the fragment:


Docstring example/comment is internally inconsistent: it says “git URL override keeps the fragment” but the example override is a local path and the output shows subdirectory being converted into a path component. Please update the wording/example so it matches the actual behavior for local vs git overrides.

Suggested change

# Fragment preservation — git URL override keeps the fragment:

# Local path override — git subdirectory fragment becomes a path component:

Copilot · 2026-04-20T23:35:46Z

+                    # For local path overrides, #subdirectory=path is a git-only
+                    # convention and is not meaningful as a file path. Convert it
+                    # to a path component instead.
+                    is_local = not (override.startswith("git+") or "://" in override)
+                    if is_local and fragment.startswith("subdirectory="):


is_local detection here differs from the project’s existing is_local_path() helper (and will treat file://... as non-local). It also misclassifies scp-style git URLs (e.g. git@github.com:org/repo) as “local”. Consider reusing a shared local-path detector and ensure file:// overrides get the same subdirectory→path handling when appropriate.

Copilot · 2026-04-20T23:35:47Z

+                    if is_local and fragment.startswith("subdirectory="):
+                        subdir = fragment.removeprefix("subdirectory=")
+                        return f"{override}/{subdir}"


Building the local override path via f"{override}/{subdir}" is not OS-safe (Windows paths/UNC) and allows subdir values like ../... or absolute paths to escape the override directory. Use path-aware joining/normalization and reject/contain path traversal before returning the resolved path.

Johanna Hawkins (ORTIZ) added 2 commits April 17, 2026 17:31

johannao76 requested a review from Copilot April 20, 2026 23:30

Copilot started reviewing on behalf of johannao76 April 20, 2026 23:31 View session

Copilot AI reviewed Apr 20, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: convert #subdirectory= fragment to path component for local path…#163

fix: convert #subdirectory= fragment to path component for local path…#163
johannao76 wants to merge 2 commits intomicrosoft:mainfrom
johannao76:fix/local-path-subdirectory-fragment

johannao76 commented Apr 20, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		export PATH=/root/.local/bin:\$PATH
		uv tool install git+https://github.com/microsoft/amplifier@main 2>&1 \| tail -3

-SMOKE_OUTPUT=$(docker exec "$CONTAINER_NAME" bash -c "
-    export PATH=/root/.local/bin:\$PATH
-    timeout 120 amplifier run '$SMOKE_PROMPT' 2>&1
-") || SMOKE_EXIT=$?
+SMOKE_OUTPUT=$(docker exec \
+    -e SMOKE_PROMPT="$SMOKE_PROMPT" \
+    "$CONTAINER_NAME" \
+    bash -c '
+        export PATH=/root/.local/bin:$PATH
+        timeout 120 amplifier run "$SMOKE_PROMPT" 2>&1
+    ') || SMOKE_EXIT=$?

	# Fragment preservation — git URL override keeps the fragment:
	# Local path override — git subdirectory fragment becomes a path component:

Conversation

johannao76 commented Apr 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

johannao76 commented Apr 20, 2026 •

edited

Loading