Skip to content

Codespace fictional space fishstick xrr94j4x46xw3vj4w#553

Open
developerparvezmosharaf wants to merge 62 commits into
microsoft:mainfrom
developerparvezmosharaf:codespace-fictional-space-fishstick-xrr94j4x46xw3vj4w
Open

Codespace fictional space fishstick xrr94j4x46xw3vj4w#553
developerparvezmosharaf wants to merge 62 commits into
microsoft:mainfrom
developerparvezmosharaf:codespace-fictional-space-fishstick-xrr94j4x46xw3vj4w

Conversation

@developerparvezmosharaf

Copy link
Copy Markdown

No description provided.

Yimin-Jin and others added 30 commits May 27, 2026 12:00
Copy the sync-sample-catalog pipeline from microsoft-foundry-for-vscode so the foundry-toolkit repo can publish samples/hosted-agent/sample-catalog.json from upstream microsoft-foundry/foundry-samples.

- .github/workflows/sync-sample-catalog.yml: workflow_dispatch-triggered job that runs the generator and opens a draft PR with the regenerated catalog.
- .github/scripts/generate_sample_catalog.mjs: walks the upstream tree, derives displayName/protocol/requiresModel from each agent.yaml + manifest, applies sample-overrides.json, and LLM-generates descriptions.
- samples/hosted-agent/sample-overrides.json: PM-managed per-path framework/requiresModel overrides.

The workflow has only a workflow_dispatch trigger and requires repo secrets (SYNC_APP_ID, SYNC_APP_PRIVATE_KEY, AZURE_OPENAI_ENDPOINT, AZURE_OPENAI_API_KEY, AZURE_OPENAI_DEPLOYMENT) to run; secrets are intentionally not configured yet, so the workflow stays dormant until they are added.
Org-level GitHub App creation requires admin permission this repo's maintainer does not have. Since foundry-toolkit has no PR checks today, the anti-recursion limitation of GITHUB_TOKEN (auto-PRs don't trigger downstream workflows) is acceptable. Drop the create-github-app-token step and the SYNC_APP_ID / SYNC_APP_PRIVATE_KEY secret requirements; comment in the workflow records the trade-off so a future switch back to a GitHub App is obvious.
workflow_dispatch requires the workflow file to exist on the default branch before dispatch is allowed (404 otherwise). Temporarily add a push trigger scoped to this feature branch and a hardcoded DEFAULT_COMMIT_SHA fallback so committing alone runs the pipeline end-to-end. To be reverted before merge.
Org policy blocks GITHUB_TOKEN from creating PRs (see https://github.com/microsoft/foundry-toolkit/actions/runs/26492230324). Switch back to the App-token approach: a personal GitHub App was created and installed on this repo, with App ID + private key stored in SYNC_APP_ID / SYNC_APP_PRIVATE_KEY secrets. This reverts the GITHUB_TOKEN simplification commit; the temporary push trigger + DEFAULT_COMMIT_SHA are still in place for one more smoke test before final cleanup.
All write operations (branch push, PR create) go through the GitHub App token, so the default GITHUB_TOKEN only needs read access for actions/checkout. Addresses PR microsoft#398 review feedback.
Upstream microsoft-foundry/foundry-samples recently added samples/python/hosted-agents/bring-your-own/invocations_ws/{hello-world,livekit-server}. The catalog generator's loose path scan picked them up, but they shouldn't appear in the picker yet (LiveKit voice prototype, not the standard invocations protocol).

Introduce a small BLOCKED_PATH_SEGMENTS deny-list and drop any template whose path contains a blocked segment. Minimal-surface change vs. a whitelist rewrite: existing csharp flat layouts and the voicelive sample stay surfaced; only invocations_ws is filtered out.

Next `Sync Sample Catalog` run will produce a follow-up PR that removes the two invocations_ws entries from sample-catalog.json.
Upstream microsoft-foundry/foundry-samples added samples/python/hosted-agents/langgraph/{invocations,responses}/* (7 templates today). The catalog generator hard-codes the framework whitelist, so the langgraph subtree was being silently skipped.

- Append 'langgraph' to FRAMEWORKS so the scan picks up the new prefix.

- Append 'langgraph': 'LangGraph' (CamelCase per upstream branding) to DIMENSION_DEFAULTS.framework.options as the last option, keeping the existing copilot-sdk / agent-framework / bring-your-own order intact.

Next `Sync Sample Catalog` run will produce a follow-up PR that adds the langgraph templates and the new framework option to sample-catalog.json.
Make the workflow_dispatch `commit_sha` input optional. When the user leaves it blank, a new `Resolve commit SHA` step queries the GitHub API for the current tip of `microsoft-foundry/foundry-samples@main` and pins the catalog generation to that SHA.

- `commit_sha`: required=false, default empty.

- New step uses `gh api` (default GITHUB_TOKEN, contents:read is enough for a public repo) and validates the result looks like a SHA before using it.

- The pinned SHA + its source (user input vs. resolved-from-main) is echoed to the step summary so reviewers can see what the run targeted.

- `Generate sample catalog` now reads from `steps.resolve-sha.outputs.sha` instead of `inputs.commit_sha` directly.
Add CODEOWNERS so every PR targeting template/stable is gated on at least one approval from Yimin-Jin or huimiu (combined with the branch's require_code_owner_reviews protection rule, enabled separately).
Make the workflow_dispatch `commit_sha` input optional. When the user leaves it blank, a new `Resolve commit SHA` step queries the GitHub API for the current tip of `microsoft-foundry/foundry-samples@main` and pins the catalog generation to that SHA.

- `commit_sha`: required=false, default empty.

- New step uses `gh api` (default GITHUB_TOKEN, contents:read is enough for a public repo) and validates the result looks like a SHA before using it.

- The pinned SHA + its source (user input vs. resolved-from-main) is echoed to the step summary so reviewers can see what the run targeted.

- `Generate sample catalog` now reads from `steps.resolve-sha.outputs.sha` instead of `inputs.commit_sha` directly.
Switch sample discovery from a fail-open blacklist (BLOCKED_PATH_SEGMENTS) to a fail-closed category allow-list (ALLOWED_CATEGORY_SEGMENTS = responses, invocations, voicelive).

Flat templates directly under a framework (csharp agent-framework layout) are always kept; nested templates must live under an allow-listed category, so new upstream groupings like a2a and invocations_ws stay out of the picker until explicitly opted in.

Validated against foundry-samples@main: 76 templates kept; a2a and invocations_ws excluded; 4 voicelive and 17 flat csharp agent-framework templates retained.
huimiu and others added 27 commits June 23, 2026 17:29
Replace the hard-coded LANGUAGES/FRAMEWORKS allowlists and the responses/invocations protocol allowlist with dynamic discovery from the samples git tree, filtered through empty-by-default BLOCKED_LANGUAGES/BLOCKED_FRAMEWORKS/BLOCKED_PROTOCOLS blacklists.

New upstream languages, frameworks, and protocols are now picked up automatically; the blacklists remain an explicit opt-out. Security validation (isSafePathSegment, commit-SHA regex, hidden-dir blocking) is unchanged.
Replace ALLOWED_CATEGORY_SEGMENTS (fail-closed allow-list) with an empty BLOCKED_CATEGORY_SEGMENTS (fail-open blacklist) so category filtering matches the language/framework/protocol blacklist model. Every discovered category now surfaces by default; add a segment to the blacklist to drop it.
…icts)

Resolve conflicts by keeping dev's all-blacklist generate_sample_catalog.mjs (a strict superset of stable's category allow-list) and taking stable's newer sample-catalog.json (regenerated by CI). CODEOWNERS and the identical workflow from stable are preserved.
…tions-ws-displayname

feat(sample-catalog): map invocations_ws protocol to 'Invocations (WebSocket)'
… restructure

Upstream foundry-samples moved hosted-agent templates from an agent.yaml + agent.manifest.yaml layout to an azd azure.yaml service manifest (old getting-started samples relocated to samples-classic/). The generator still looked for agent.yaml, so scanTemplates found 0 templates and the sync PR wiped the entire catalog.

- Discover templates by azure.yaml instead of agent.yaml

- Parse protocol from the service protocols[] list (unchanged - protocol: field)

- Detect requiresModel via AZURE_AI_MODEL_DEPLOYMENT_NAME env var OR an ai-project deployments: block (the azure.yaml successor to the manifest kind: model resource)

- Remove now-dead agent.manifest.yaml fetch/parse

Verified locally against foundry-samples@9c4e42a: 91 templates found, catalog identical to the previous sync (paths/protocols/requiresModel stable).
… restructure

Port the generator fix to template/stable (parity with template/dev).

Upstream foundry-samples moved hosted-agent templates from an agent.yaml + agent.manifest.yaml layout to an azd azure.yaml service manifest (old getting-started samples relocated to samples-classic/). The stable generator still looked for agent.yaml, so the next sync would find 0 templates and wipe the catalog.

- Discover templates by azure.yaml instead of agent.yaml

- Parse protocol from the service protocols[] list (unchanged - protocol: field)

- Detect requiresModel via AZURE_AI_MODEL_DEPLOYMENT_NAME env var OR an ai-project deployments: block

- Remove now-dead agent.manifest.yaml fetch/parse

- Also brings the invocations_ws -> 'Invocations (WebSocket)' displayName mapping so the generator matches template/dev exactly

Verified against foundry-samples@9c4e42a: 91 templates found; catalog stable (paths/protocols/requiresModel unchanged).
@microsoft-github-policy-service

Copy link
Copy Markdown

@developerparvezmosharaf please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

@developerparvezmosharaf developerparvezmosharaf left a comment

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve

@developerparvezmosharaf developerparvezmosharaf left a comment

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review Complete

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants