spigell
diff --git a/‎.COMMIT_MSG.txt‎
Lines changed: 3 additions & 0 deletions b/‎.COMMIT_MSG.txt‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.agents/skills/gemini-cli-fork-resyncer/SKILL.md‎
Lines changed: 22 additions & 0 deletions b/‎.agents/skills/gemini-cli-fork-resyncer/SKILL.md‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎.gemini/skills/docs-writer/SKILL.md‎
Lines changed: 15 additions & 6 deletions b/‎.gemini/skills/docs-writer/SKILL.md‎
Lines changed: 15 additions & 6 deletions
diff --git a/‎.github/actions/run-tests/action.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/actions/run-tests/action.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/actions/verify-release/action.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/actions/verify-release/action.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/workflows/chained_e2e.yml‎
Lines changed: 3 additions & 0 deletions b/‎.github/workflows/chained_e2e.yml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 9 additions & 0 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎.github/workflows/deflake.yml‎
Lines changed: 3 additions & 0 deletions b/‎.github/workflows/deflake.yml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.github/workflows/test-build-binary.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/test-build-binary.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
@@ -0,0 +1,3 @@
+Clarify fork bump behavior in resync skill
+
+Document that the fork should be bumped from upstream without applying fork patches back onto the upstream release branch, keeping fork-specific changes isolated to the fork resync workflow.
@@ -12,6 +12,10 @@ description: >-
 Upgrade this fork to a target upstream release tag (for example `v0.40.0`) and
 carry forward fork-specific behavior safely and repeatably.
 
+Important: bump the fork from upstream, but do not apply fork patches back onto
+the upstream release branch itself. Keep fork-specific changes isolated to the
+fork resync branch and re-apply them only in the fork context.
+
 ## Inputs
 
 - `target_tag`: Upstream release tag to sync to (required), for example
@@ -46,6 +50,8 @@ carry forward fork-specific behavior safely and repeatably.
    - Release/version metadata updates.
    - Temporary or accidental files (must not be carried).
 3. Build a replay list with commit SHAs or file-scoped patch groups.
+4. Treat the upstream tag as the base release to bump from, not a place to
+   merge fork patches into.
 
 ## Step 3: Replay Patches onto Target Release
 
@@ -107,6 +113,22 @@ When failures occur:
    - Known residual risks, if any.
 3. If requested, request developer review.
 
+## Step 8: Trigger Image Build (Optional)
+
+If the fork update requires a new container image, trigger the
+`google-gemini-publish.yaml` workflow in the `spigell/my-images` repository on
+the `main` branch.
+
+1. Use the GitHub Actions trigger tool, such as
+   `mcp_github-mcp_actions_run_trigger` or `gh workflow run`.
+2. Pass exactly two inputs to the workflow:
+   - `gemini_cli_git_ref`: the name of the newly pushed branch, for example
+     `spigell/chore/update-to-0.40.0`.
+   - `gemini_cli_version`: the newly generated version string from
+     `package.json`, for example `0.40.0-spigell.20260501.3d5bdc052`.
+3. Critical warning: the `gemini_cli_version` input must always receive the
+   exact version string. Never pass the branch name to the version input.
+
 ## Output Contract
 
 Always report:
 
@@ -85,17 +85,25 @@ accessible.
 
 - **Callouts**: Use GitHub-flavored markdown alerts to highlight important
   information. To ensure the formatting is preserved by `npm run format`, place
-  an empty line, then the `<!-- prettier-ignore -->` comment directly before
-  the callout block. The callout type (`[!TYPE]`) should be on the first line,
-  followed by a newline, and then the content, with each subsequent line of
-  content starting with `>`. Available types are `NOTE`, `TIP`, `IMPORTANT`,
-  `WARNING`, and `CAUTION`.
+  an empty line, then a prettier ignore comment directly before the callout
+  block. Use `<!-- prettier-ignore -->` for standard Markdown files (`.md`) and
+  `{/* prettier-ignore */}` for MDX files (`.mdx`). The callout type (`[!TYPE]`)
+  should be on the first line, followed by a newline, and then the content, with
+  each subsequent line of content starting with `>`. Available types are `NOTE`,
+  `TIP`, `IMPORTANT`, `WARNING`, and `CAUTION`.
 
-  Example:
+  Example (.md):
 
 <!-- prettier-ignore -->
 > [!NOTE]
 > This is an example of a multi-line note that will be preserved
+> by Prettier.
+
+  Example (.mdx):
+
+{/* prettier-ignore */}
+> [!NOTE]
+> This is an example of a multi-line note that will be preserved
 > by Prettier.
 
 ### Links
@@ -118,6 +126,7 @@ accessible.
 <!-- prettier-ignore -->
 > [!NOTE]
 > This is an experimental feature currently under active development.
+(Note: Use `{/* prettier-ignore */}` if editing an `.mdx` file.)
 
 - **Headings:** Use hierarchical headings to support the user journey.
 - **Procedures:**
 
@@ -28,6 +28,7 @@ runs:
     - name: 'Run Tests'
       env:
         GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'
+        GEMINI_CLI_TRUST_WORKSPACE: true
       working-directory: '${{ inputs.working-directory }}'
       run: |-
         echo "::group::Build"
 
@@ -98,6 +98,7 @@ runs:
       working-directory: '${{ inputs.working-directory }}'
       env:
         GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'
+        GEMINI_CLI_TRUST_WORKSPACE: true
         INTEGRATION_TEST_USE_INSTALLED_GEMINI: 'true'
         # We must diable CI mode here because it interferes with interactive tests.
         # See https://github.com/google-gemini/gemini-cli/issues/10517
 
@@ -167,6 +167,7 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           VERBOSE: 'true'
           BUILD_SANDBOX_FLAGS: '--cache-from type=gha --cache-to type=gha,mode=max'
@@ -212,6 +213,7 @@ jobs:
         if: "${{runner.os != 'Windows'}}"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           SANDBOX: 'sandbox:none'
           VERBOSE: 'true'
@@ -288,6 +290,7 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           SANDBOX: 'sandbox:none'
           VERBOSE: 'true'
 
@@ -102,6 +102,12 @@ jobs:
       - name: 'Run yamllint'
         run: 'node scripts/lint.js --yamllint'
 
+      - name: 'Build project for typecheck'
+        run: 'npm run build'
+
+      - name: 'Run typecheck'
+        run: 'npm run typecheck'
+
       - name: 'Run Prettier'
         run: 'node scripts/lint.js --prettier'
 
@@ -173,6 +179,7 @@ jobs:
       - name: 'Run tests and generate reports'
         env:
           NO_COLOR: true
+          GEMINI_CLI_TRUST_WORKSPACE: true
         run: |
           if [[ "${{ matrix.shard }}" == "cli" ]]; then
             npm run test:ci --workspace "@google/gemini-cli"
@@ -261,6 +268,7 @@ jobs:
       - name: 'Run tests and generate reports'
         env:
           NO_COLOR: true
+          GEMINI_CLI_TRUST_WORKSPACE: true
         run: |
           if [[ "${{ matrix.shard }}" == "cli" ]]; then
             npm run test:ci --workspace "@google/gemini-cli" -- --coverage.enabled=false
@@ -424,6 +432,7 @@ jobs:
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           NO_COLOR: true
+          GEMINI_CLI_TRUST_WORKSPACE: true
           NODE_OPTIONS: '--max-old-space-size=32768 --max-semi-space-size=256'
           UV_THREADPOOL_SIZE: '32'
           NODE_ENV: 'test'
 
@@ -62,6 +62,7 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           IS_DOCKER: "${{ matrix.sandbox == 'sandbox:docker' }}"
           KEEP_OUTPUT: 'true'
           RUNS: '${{ github.event.inputs.runs }}'
@@ -105,6 +106,7 @@ jobs:
         if: "runner.os != 'Windows'"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           RUNS: '${{ github.event.inputs.runs }}'
           SANDBOX: 'sandbox:none'
@@ -159,6 +161,7 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           SANDBOX: 'sandbox:none'
           VERBOSE: 'true'
 
@@ -141,6 +141,7 @@ jobs:
         if: "github.event_name != 'pull_request'"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
         run: |
           echo "Running integration tests with binary..."
           if [[ "${{ matrix.os }}" == 'windows-latest' ]]; then
 
@@ -68,3 +68,4 @@ temp_agents/
 
 # conductor extension and planning directories
 conductor/
+.COMMIT_MSG.txt
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Clarify fork bump behavior in resync skill`
	`2`	`+`
	`3`	`+Document that the fork should be bumped from upstream without applying fork patches back onto the upstream release branch, keeping fork-specific changes isolated to the fork resync workflow.`
Original file line number	Diff line number	Diff line change
`@@ -68,3 +68,4 @@ temp_agents/`
`68`	`68`
`69`	`69`	`# conductor extension and planning directories`
`70`	`70`	`conductor/`
	`71`	`+.COMMIT_MSG.txt`