mervexai 0.0.97

package/src/tool/repomap.ts

@@ -0,0 +1,287 @@
+import path from "path"
+import { Effect, Schema, Context } from "effect"
+import { FSUtil } from "@msrfteam/core/fs-util"
+import { Ripgrep } from "@msrfteam/core/ripgrep"
+import * as Tool from "./tool"
+
+interface Tag {
+  relFname: string
+  fname: string
+  line: number
+  name: string
+  kind: "def" | "ref"
+}
+
+export interface RepoMapInterface {
+  readonly getRankedTagsMap: (params: {
+    chatFiles: string[]
+    otherFiles: string[]
+    maxMapTokens: number
+    mentionedFnames?: Set<string>
+    mentionedIdents?: Set<string>
+  }) => Effect.Effect<string | undefined>
+}
+
+export class RepoMapService extends Context.Service<RepoMapService, RepoMapInterface>()("@mervex/RepoMap") {}
+
+export const Parameters = Schema.Struct({
+  directory: Schema.optional(Schema.String).annotate({
+    description: "The directory to scan for repo map. Defaults to current working directory.",
+  }),
+  maxTokens: Schema.optional(Schema.Number).annotate({
+    description: "Maximum tokens for the repo map output. Default 1024.",
+  }),
+})
+
+export const repomapFromContext = (fs: FSUtil.Interface, ripgrep: Ripgrep.Interface, dir: string) =>
+  Effect.gen(function* () {
+    const files = yield* findSourceFiles(fs, ripgrep, dir)
+    if (files.length === 0) return undefined
+
+    const allTags: Tag[] = []
+    const defs = new Map<string, Set<string>>()
+    const refs = new Map<string, string[]>()
+
+    for (const f of files) {
+      const tags = yield* extractTags(fs, f, dir)
+      allTags.push(...tags)
+      for (const tag of tags) {
+        if (tag.kind === "def") {
+          if (!defs.has(tag.name)) defs.set(tag.name, new Set())
+          defs.get(tag.name)!.add(tag.relFname)
+        } else {
+          if (!refs.has(tag.name)) refs.set(tag.name, [])
+          refs.get(tag.name)!.push(tag.relFname)
+        }
+      }
+    }
+
+    const maxTokens = 1024
+    const ranked = rankTags(allTags, defs, refs, maxTokens)
+    return renderTree(ranked, dir)
+  })
+
+const findSourceFiles = (fs: FSUtil.Interface, ripgrep: Ripgrep.Interface, dir: string) =>
+  Effect.gen(function* () {
+    const pattern =
+      "*.{ts,tsx,js,jsx,py,go,rs,java,kt,c,cpp,h,hpp,rb,php,cs,swift,scala,ex,exs,elm,clj,cljs,scm,hs,lhs,erl,hrl,fs,fsx,vb,pl,pm,r,dart,gradle,sh,bash,zsh,fish,mjs,cjs,mts,cts,vue,svelte,astro,md,mdx,yaml,yml,json,toml,cfg,conf,ini,env,dockerfile,makefile,cmake,tf,proto,graphql,sql,css,scss,less,html,xml,txt}"
+    const entries = yield* ripgrep.find({
+      cwd: dir,
+      pattern,
+      limit: 400,
+    })
+    return entries.map((entry) => path.join(dir, entry.path))
+  })
+
+const extractTags = (fs: FSUtil.Interface, fname: string, root: string) =>
+  Effect.gen(function* () {
+    const relFname = path.relative(root, fname)
+    const ext = path.extname(fname).toLowerCase()
+    const tags: Tag[] = []
+
+    const content = yield* fs.readFileStringSafe(fname)
+    if (!content) return tags
+    const lines = content.split("\n")
+
+    const patterns = getPatterns(ext)
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i]
+      for (const pattern of patterns) {
+        const match = line.match(pattern.regex)
+        if (match) {
+          const name = match[1] || match[2] || match[0].trim()
+          tags.push({
+            relFname,
+            fname,
+            line: i + 1,
+            name: name.replace(/[^a-zA-Z0-9_$]/g, ""),
+            kind: pattern.kind as "def" | "ref",
+          })
+        }
+      }
+    }
+
+    return tags
+  })
+
+interface Pattern {
+  regex: RegExp
+  kind: string
+}
+
+function getPatterns(ext: string): Pattern[] {
+  const defPatterns: Pattern[] = [
+    { regex: /(?:export\s+)?(?:async\s+)?function\s+(\w+)/g, kind: "def" },
+    { regex: /(\w+)\s*=\s*(?:async\s+)?(?:function|\([^)]*\)\s*=>|=>)/g, kind: "def" },
+    { regex: /(?:public|private|protected|static)?\s*(?:async\s+)?(\w+)\s*\([^)]*\)\s*\{/g, kind: "def" },
+    { regex: /(?:export\s+)?(?:abstract\s+)?class\s+(\w+)/g, kind: "def" },
+    { regex: /(?:export\s+)?interface\s+(\w+)/g, kind: "def" },
+    { regex: /(?:export\s+)?(?:type|enum)\s+(\w+)/g, kind: "def" },
+    { regex: /(?:export\s+)?(?:const|let|var)\s+(\w+)\s*[=:]/g, kind: "def" },
+    { regex: /(?:import\s+)(\w+)/g, kind: "ref" },
+    { regex: /new\s+(\w+)/g, kind: "ref" },
+    { regex: /(?:from\s+['"])([^'"]+)/g, kind: "ref" },
+  ]
+
+  if ([".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts"].includes(ext)) return defPatterns
+  if ([".py"].includes(ext)) {
+    return [
+      { regex: /(?:async\s+)?def\s+(\w+)/g, kind: "def" },
+      { regex: /class\s+(\w+)/g, kind: "def" },
+      { regex: /(\w+)\s*=\s*(?:lambda|class)/g, kind: "def" },
+    ]
+  }
+  if ([".go"].includes(ext)) {
+    return [
+      { regex: /func\s+(?:\w+\.)?(\w+)/g, kind: "def" },
+      { regex: /type\s+(\w+)\s+(?:struct|interface)/g, kind: "def" },
+    ]
+  }
+  if ([".rs"].includes(ext)) {
+    return [
+      { regex: /(?:pub\s+)?(?:async\s+)?fn\s+(\w+)/g, kind: "def" },
+      { regex: /(?:pub\s+)?struct\s+(\w+)/g, kind: "def" },
+      { regex: /(?:pub\s+)?enum\s+(\w+)/g, kind: "def" },
+      { regex: /(?:pub\s+)?trait\s+(\w+)/g, kind: "def" },
+      { regex: /(?:pub\s+)?impl\s+(\w+)/g, kind: "def" },
+    ]
+  }
+  if ([".java", ".kt"].includes(ext)) {
+    return [
+      { regex: /(?:public|private|protected|static)?\s*(?:final\s+)?(?:[\w<>,\[\] ]+)\s+(\w+)\s*\(/g, kind: "def" },
+      { regex: /(?:public|private|protected)?\s*class\s+(\w+)/g, kind: "def" },
+      { regex: /(?:public|private|protected)?\s*interface\s+(\w+)/g, kind: "def" },
+      { regex: /(?:public|private|protected)?\s*enum\s+(\w+)/g, kind: "def" },
+    ]
+  }
+  if ([".rb"].includes(ext)) {
+    return [
+      { regex: /def\s+(\w+)/g, kind: "def" },
+      { regex: /class\s+(\w+)/g, kind: "def" },
+      { regex: /module\s+(\w+)/g, kind: "def" },
+    ]
+  }
+  return defPatterns
+}
+
+function rankTags(
+  allTags: Tag[],
+  defs: Map<string, Set<string>>,
+  refs: Map<string, string[]>,
+  maxTokens: number
+): Tag[] {
+  const tagScore = new Map<string, number>()
+  const tagMap = new Map<string, Tag[]>()
+
+  for (const tag of allTags) {
+    const key = `${tag.relFname}:${tag.name}`
+    if (!tagMap.has(key)) tagMap.set(key, [])
+    tagMap.get(key)!.push(tag)
+  }
+
+  for (const [key, tags] of tagMap) {
+    const tag = tags[0]
+    let score = 0
+    const refCount = refs.get(tag.name)?.length || 0
+    const defCount = defs.get(tag.name)?.size || 0
+
+    if (tag.kind === "def") {
+      score += refCount * 3
+      score += defCount * 2
+      if (tag.name[0] === tag.name[0]?.toUpperCase()) score += 2
+      if (tag.name.length >= 8) score += 1
+    }
+
+    tagScore.set(key, score)
+  }
+
+  const sorted = [...tagMap.entries()].sort((a, b) => (tagScore.get(b[0]) || 0) - (tagScore.get(a[0]) || 0))
+
+  const result: Tag[] = []
+  let tokens = 0
+  const seen = new Set<string>()
+
+  for (const [key, tags] of sorted) {
+    const tag = tags[0]
+    if (seen.has(key)) continue
+    seen.add(key)
+
+    tokens += tag.name.length + 2
+    if (tokens > maxTokens * 4) break
+
+    result.push(tag)
+  }
+
+  return result
+}
+
+function renderTree(rankedTags: Tag[], root: string): string {
+  if (rankedTags.length === 0) return ""
+
+  const byFile = new Map<string, Tag[]>()
+  for (const tag of rankedTags) {
+    if (!byFile.has(tag.relFname)) byFile.set(tag.relFname, [])
+    byFile.get(tag.relFname)!.push(tag)
+  }
+
+  const output: string[] = []
+  output.push("## RepoMap (codebase structure)")
+  output.push("")
+
+  for (const [fname, tags] of byFile) {
+    output.push(`${fname}:`)
+    for (const tag of tags.slice(0, 10)) {
+      const marker = tag.kind === "def" ? "▸" : "·"
+      output.push(`  ${marker} ${tag.name} (line ${tag.line})`)
+    }
+  }
+
+  output.push("")
+  return output.join("\n")
+}
+
+export const RepoMapTool = Tool.define(
+  "repomap",
+  Effect.gen(function* () {
+    const fs = yield* FSUtil.Service
+    const ripgrep = yield* Ripgrep.Service
+    return {
+      description:
+        "Generate a ranked map of the codebase showing important files, functions, and classes. Use this to give the AI an overview of the codebase structure without sending entire files.",
+      parameters: Parameters,
+      execute: (params: { directory?: string; maxTokens?: number }, ctx: Tool.Context) =>
+        Effect.gen(function* () {
+          const dir = params.directory || process.cwd()
+
+          const files = yield* findSourceFiles(fs, ripgrep, dir)
+          if (files.length === 0) {
+            return { title: "RepoMap", metadata: {}, output: "No source files found in " + dir }
+          }
+
+          const allTags: Tag[] = []
+          const defs = new Map<string, Set<string>>()
+          const refs = new Map<string, string[]>()
+
+          for (const f of files) {
+            const tags = yield* extractTags(fs, f, dir)
+            allTags.push(...tags)
+            for (const tag of tags) {
+              if (tag.kind === "def") {
+                if (!defs.has(tag.name)) defs.set(tag.name, new Set())
+                defs.get(tag.name)!.add(tag.relFname)
+              } else {
+                if (!refs.has(tag.name)) refs.set(tag.name, [])
+                refs.get(tag.name)!.push(tag.relFname)
+              }
+            }
+          }
+
+          const maxTokens = params.maxTokens || 1024
+          const ranked = rankTags(allTags, defs, refs, maxTokens)
+          const output = renderTree(ranked, dir)
+
+          return { title: "RepoMap", metadata: {}, output: output || "No meaningful code structure found." }
+        }).pipe(Effect.orDie),
+    }
+  }),
+)

package/src/tool/schema.ts

@@ -0,0 +1,14 @@
+import { Schema } from "effect"
+
+import { Identifier } from "@/id/id"
+import { statics } from "@msrfteam/core/schema"
+
+const toolIdSchema = Schema.String.check(Schema.isStartsWith("tool")).pipe(Schema.brand("ToolID"))
+
+export type ToolID = typeof toolIdSchema.Type
+
+export const ToolID = toolIdSchema.pipe(
+  statics((schema: typeof toolIdSchema) => ({
+    ascending: (id?: string) => schema.make(Identifier.ascending("tool", id)),
+  })),
+)

package/src/tool/shell/id.ts

@@ -0,0 +1,19 @@
+const kinds = ["bash", "pwsh", "powershell", "cmd"] as const
+export type Kind = (typeof kinds)[number]
+
+const shellKinds = new Set<string>(kinds)
+
+function isKind(value: string): value is Kind {
+  return shellKinds.has(value)
+}
+
+export function toKind(value: string): Kind {
+  return isKind(value) ? value : "bash"
+}
+
+// Keep the exposed tool ID and permission key as "bash" for compatibility with
+// existing plugins, users, and saved permissions. Rename with mervex 2.0.
+export const ToolID = "bash"
+export type ToolID = typeof ToolID
+
+export * as ShellID from "./id"

package/src/tool/shell/prompt.ts

@@ -0,0 +1,295 @@
+import { Schema } from "effect"
+import DESCRIPTION from "./shell.txt"
+import { PositiveInt } from "@msrfteam/core/schema"
+import { Global } from "@msrfteam/core/global"
+import { ShellID } from "./id"
+
+const PS = new Set(["powershell", "pwsh"])
+const CMD = new Set(["cmd"])
+
+export type Limits = {
+  maxLines: number
+  maxBytes: number
+}
+
+export function parameterSchema() {
+  return Schema.Struct({
+    command: Schema.String.annotate({ description: "The command to execute" }),
+    timeout: Schema.optional(PositiveInt).annotate({ description: "Optional timeout in milliseconds" }),
+    workdir: Schema.optional(Schema.String).annotate({
+      description: `The working directory to run the command in. Defaults to the current directory. Use this instead of 'cd' commands.`,
+    }),
+  })
+}
+
+export const Parameters = parameterSchema()
+export type Parameters = Schema.Schema.Type<typeof Parameters>
+
+function renderPrompt(template: string, values: Record<string, string>) {
+  return template.replace(/\$\{(\w+)\}/g, (_, key: string) => {
+    const value = values[key]
+    if (value === undefined) throw new Error(`Missing shell prompt value: ${key}`)
+    return value
+  })
+}
+
+function shellDisplayName(name: string) {
+  if (name === "pwsh") return "PowerShell (7+)"
+  if (name === "powershell") return "Windows PowerShell (5.1)"
+  if (name === "cmd") return "cmd.exe"
+  return name
+}
+
+function powershellNotes(name: string) {
+  if (name === "pwsh") {
+    return `# PowerShell (7+) shell notes
+- This cross-platform shell supports pipeline chain operators (\`&&\` and \`||\`).
+- Use double quotes for interpolated strings (\`"Hello $name"\`), single quotes for verbatim strings.
+- Prefer full cmdlet names like \`Get-ChildItem\`, \`Set-Content\`, \`Remove-Item\`, and \`New-Item\` over aliases.
+- Use \`$(...)\` for subexpressions. Use \`@(...)\` for array expressions.
+- To call a native executable whose path contains spaces, use the call operator: \`& "path/to/exe" args\`.
+- NEVER use a trailing \`&\` to background commands (e.g. \`node server.js &\`) — it is not supported. Run in background with \`Start-Job -ScriptBlock { <command> }\` (then \`Receive-Job\`/\`Remove-Job\`) or \`Start-Process -NoNewWindow\`.
+- Escape special characters with the PowerShell backtick character.`
+  }
+  if (name === "powershell") {
+    return `# Windows PowerShell (5.1) shell notes
+- Use \`cmd1; if ($?) { cmd2 }\` to chain dependent commands.
+- Use double quotes for interpolated strings (\`"Hello $name"\`), single quotes for verbatim strings.
+- Prefer full cmdlet names like \`Get-ChildItem\`, \`Set-Content\`, \`Remove-Item\`, and \`New-Item\` over aliases.
+- Use \`$(...)\` for subexpressions. Use \`@(...)\` for array expressions.
+- To call a native executable whose path contains spaces, use the call operator: \`& "path/to/exe" args\`.
+- NEVER use a trailing \`&\` to background commands (e.g. \`node server.js &\`) — it is a syntax error here. Run in background with \`Start-Job -ScriptBlock { <command> }\` (then \`Receive-Job\`/\`Remove-Job\`) or \`Start-Process -NoNewWindow\`.
+- Escape special characters with the PowerShell backtick character.`
+  }
+  return ""
+}
+
+function chainGuidance(name: string) {
+  if (name === "powershell") {
+    return "If the commands depend on each other and must run sequentially, avoid '&&' in this shell because Windows PowerShell (5.1) does not support it. Use PowerShell conditionals such as `cmd1; if ($?) { cmd2 }` when later commands must depend on earlier success."
+  }
+  if (PS.has(name)) {
+    return "If the commands depend on each other and must run sequentially, use a single bash tool call with '&&' to chain them together (e.g., `git add . && git commit -m \"message\" && git push`). For instance, if one operation must complete before another starts (like New-Item before Copy-Item, Write before bash for git operations, or git add before git commit), run these operations sequentially instead."
+  }
+  if (CMD.has(name)) {
+    return "If the commands depend on each other and must run sequentially, use a single bash tool call with `&&` to chain them together (e.g., `mkdir out && dir out`). For instance, if one operation must complete before another starts, run these operations sequentially instead."
+  }
+  return "If the commands depend on each other and must run sequentially, use a single Bash call with '&&' to chain them together (e.g., `git add . && git commit -m \"message\" && git push`). For instance, if one operation must complete before another starts (like mkdir before cp, Write before Bash for git operations, or git add before git commit), run these operations sequentially instead."
+}
+
+function bashCommandSection(chain: string, limits: Limits, defaultTimeoutMs: number) {
+  return `Before executing the command, please follow these steps:
+
+1. Directory Verification:
+   - If the command will create new directories or files, first use \`ls\` to verify the parent directory exists and is the correct location
+   - For example, before running "mkdir foo/bar", first use \`ls foo\` to check that "foo" exists and is the intended parent directory
+
+2. Command Execution:
+   - Always quote file paths that contain spaces with double quotes (e.g., rm "path with spaces/file.txt")
+   - Examples of proper quoting:
+     - mkdir "/Users/name/My Documents" (correct)
+     - mkdir /Users/name/My Documents (incorrect - will fail)
+     - python "/path/with spaces/script.py" (correct)
+     - python /path/with spaces/script.py (incorrect - will fail)
+   - After ensuring proper quoting, execute the command.
+   - Capture the output of the command.
+
+Usage notes:
+  - The command argument is required.
+  - You can specify an optional timeout in milliseconds. If not specified, commands will time out after ${defaultTimeoutMs}ms.
+  - If the output exceeds ${limits.maxLines} lines or ${limits.maxBytes} bytes, it will be truncated and the full output will be written to a file. You can use Read with offset/limit to read specific sections or Grep to search the full content. Do NOT use \`head\`, \`tail\`, or other truncation commands to limit output; the full output will already be captured to a file for more precise searching.
+
+  - Avoid using Bash with the \`find\`, \`grep\`, \`cat\`, \`head\`, \`tail\`, \`sed\`, \`awk\`, or \`echo\` commands, unless explicitly instructed or when these commands are truly necessary for the task. Instead, always prefer using the dedicated tools for these commands:
+    - File search: Use Glob (NOT find or ls)
+    - Content search: Use Grep (NOT grep or rg)
+    - Read files: Use Read (NOT cat/head/tail)
+    - Edit files: Use Edit (NOT sed/awk)
+    - Write files: Use Write (NOT echo >/cat <<EOF)
+    - Communication: Output text directly (NOT echo/printf)
+  - When issuing multiple commands:
+    - If the commands are independent and can run in parallel, make multiple bash tool calls in a single message. For example, if you need to run "git status" and "git diff", send a single message with two bash tool calls in parallel.
+    - ${chain}
+    - Use ';' only when you need to run commands sequentially but don't care if earlier commands fail
+    - DO NOT use newlines to separate commands (newlines are ok in quoted strings)
+  - AVOID using \`cd <directory> && <command>\`. Use the \`workdir\` parameter to change directories instead.
+    <good-example>
+    Use workdir="/foo/bar" with command: pytest tests
+    </good-example>
+    <bad-example>
+    cd /foo/bar && pytest tests
+    </bad-example>`
+}
+
+function powershellCommandSection(
+  name: string,
+  chain: string,
+  pathSep: string,
+  limits: Limits,
+  defaultTimeoutMs: number,
+) {
+  return `${powershellNotes(name)}
+
+Before executing the command, please follow these steps:
+
+1. Directory Verification:
+   - If the command will create new directories or files, first use \`Test-Path -LiteralPath <parent>\` to verify the parent directory exists and is the correct location
+   - For example, before creating \`foo${pathSep}bar\`, first use \`Test-Path -LiteralPath "foo"\` to check that \`foo\` exists and is the intended parent directory
+
+2. Command Execution:
+   - Always quote file paths that contain spaces with double quotes (e.g., Remove-Item -LiteralPath "path with spaces${pathSep}file.txt")
+   - Examples of proper quoting:
+     - New-Item -ItemType Directory -Path "My Documents" (correct)
+     - New-Item -ItemType Directory -Path My Documents (incorrect - path is split)
+     - & "path with spaces${pathSep}script.ps1" (correct)
+     - path with spaces${pathSep}script.ps1 (incorrect - path is split and not invoked)
+   - After ensuring proper quoting, execute the command.
+   - Capture the output of the command.
+
+Usage notes:
+  - The command argument is required.
+  - You can specify an optional timeout in milliseconds. If not specified, commands will time out after ${defaultTimeoutMs}ms.
+  - If the output exceeds ${limits.maxLines} lines or ${limits.maxBytes} bytes, it will be truncated and the full output will be written to a file. You can use Read with offset/limit to read specific sections or Grep to search the full content. Do NOT use \`Select-Object -First\`, \`Select-Object -Last\`, or other truncation commands to limit output; the full output will already be captured to a file for more precise searching.
+
+  - Avoid using Shell with PowerShell file/content cmdlets unless explicitly instructed or when these cmdlets are truly necessary for the task. Instead, always prefer using the dedicated tools for these commands:
+    - File search: Use Glob (NOT Get-ChildItem)
+    - Content search: Use Grep (NOT Select-String)
+    - Read files: Use Read (NOT Get-Content)
+    - Edit files: Use Edit (NOT Set-Content)
+    - Write files: Use Write (NOT Set-Content/Out-File or here-strings)
+    - Communication: Output text directly (NOT Write-Output/Write-Host)
+  - When issuing multiple commands:
+    - If the commands are independent and can run in parallel, make multiple bash tool calls in a single message. For example, if you need to run "git status" and "git diff", send a single message with two bash tool calls in parallel.
+    - ${chain}
+    - Use \`;\` only when you need to run commands sequentially but don't care if earlier commands fail
+    - DO NOT use newlines to separate commands (newlines are ok in quoted strings)
+  - AVOID changing directories inside the command. Use the \`workdir\` parameter to change directories instead.
+    <good-example>
+    Use workdir="project${pathSep}subdir" with command: pytest tests
+    </good-example>
+    <bad-example>
+    ${name === "powershell" ? `Set-Location -LiteralPath "project${pathSep}subdir"; if ($?) { pytest tests }` : `Set-Location -LiteralPath "project${pathSep}subdir" && pytest tests`}
+    </bad-example>`
+}
+
+function cmdCommandSection(chain: string, limits: Limits, defaultTimeoutMs: number) {
+  return `# cmd.exe shell notes
+- Use double quotes for paths with spaces.
+- Use %VAR% for environment variables.
+- Use \`if exist\` for existence checks.
+- Use \`call\` when invoking batch files from another batch-style command.
+
+Before executing the command, please follow these steps:
+
+1. Directory Verification:
+   - If the command will create new directories or files, first use \`if exist\` to verify the parent directory exists and is the correct location
+   - For example, before creating \`foo\\bar\`, first use \`if exist "foo\\" dir "foo"\` to check that \`foo\` exists and is the intended parent directory
+
+2. Command Execution:
+   - Always quote file paths that contain spaces with double quotes (e.g., del "path with spaces\\file.txt")
+   - Examples of proper quoting:
+     - mkdir "My Documents" (correct)
+     - mkdir My Documents (incorrect - path is split)
+     - call "path with spaces\\script.bat" (correct)
+     - path with spaces\\script.bat (incorrect - path is split and not invoked correctly)
+   - After ensuring proper quoting, execute the command.
+   - Capture the output of the command.
+
+Usage notes:
+  - The command argument is required.
+  - You can specify an optional timeout in milliseconds. If not specified, commands will time out after ${defaultTimeoutMs}ms.
+  - If the output exceeds ${limits.maxLines} lines or ${limits.maxBytes} bytes, it will be truncated and the full output will be written to a file. You can use Read with offset/limit to read specific sections or Grep to search the full content. Do NOT use \`more\` or other pagination commands to limit output; the full output will already be captured to a file for more precise searching.
+
+  - Avoid using Shell with cmd.exe file/content commands unless explicitly instructed or when these commands are truly necessary for the task. Instead, always prefer using the dedicated tools for these commands:
+    - File search: Use Glob (NOT dir /s)
+    - Content search: Use Grep (NOT findstr)
+    - Read files: Use Read (NOT type)
+    - Edit files: Use Edit (NOT copy)
+    - Write files: Use Write (NOT echo > file)
+    - Communication: Output text directly (NOT echo)
+  - When issuing multiple commands:
+    - If the commands are independent and can run in parallel, make multiple bash tool calls in a single message. For example, if you need to run "dir" and "where cmd", send a single message with two bash tool calls in parallel.
+    - ${chain}
+    - Use \`&\` only when you need to run commands sequentially but don't care if earlier commands fail
+    - DO NOT use newlines to separate commands (newlines are ok in quoted strings)
+  - AVOID changing directories inside the command. Use the \`workdir\` parameter to change directories instead.
+    <good-example>
+    Use workdir="project\\subdir" with command: dir
+    </good-example>
+    <bad-example>
+    cd /d "project\\subdir" && dir
+    </bad-example>`
+}
+
+function profile(name: string, platform: NodeJS.Platform, limits: Limits, defaultTimeoutMs: number) {
+  const isPowerShell = PS.has(name)
+  const chain = chainGuidance(name)
+  if (CMD.has(name)) {
+    return {
+      intro: `Executes a given ${shellDisplayName(name)} command with optional timeout, ensuring proper handling and security measures.`,
+      workdirSection:
+        "All commands run in the current working directory by default. Use the `workdir` parameter if you need to run a command in a different directory. AVOID changing directories inside the command - use `workdir` instead.",
+      commandSection: cmdCommandSection(chain, limits, defaultTimeoutMs),
+      gitCommands: "git commands",
+      gitCommandRestriction: "git commands",
+      createPrInstruction: "Create PR using a temporary body file so cmd.exe quoting stays simple.",
+      createPrExample: `(\n  echo ## Summary\n  echo - ^<1-3 bullet points^>\n) > pr-body.txt\ngh pr create --title "the pr title" --body-file pr-body.txt`,
+    }
+  }
+  if (isPowerShell) {
+    return {
+      intro: `Executes a given ${shellDisplayName(name)} command with optional timeout, ensuring proper handling and security measures.`,
+      workdirSection:
+        "All commands run in the current working directory by default. Use the `workdir` parameter if you need to run a command in a different directory. AVOID changing directories inside the command - use `workdir` instead.",
+      commandSection: powershellCommandSection(
+        name,
+        chain,
+        platform === "win32" ? "\\" : "/",
+        limits,
+        defaultTimeoutMs,
+      ),
+      gitCommands: "git commands",
+      gitCommandRestriction: "git commands",
+      createPrInstruction: "Create PR using gh pr create with a PowerShell here-string to pass the body correctly.",
+      createPrExample: `gh pr create --title "the pr title" --body @'
+## Summary
+- <1-3 bullet points>
+'@`,
+    }
+  }
+  return {
+    intro:
+      "Executes a given bash command in a persistent shell session with optional timeout, ensuring proper handling and security measures.",
+    workdirSection:
+      "All commands run in the current working directory by default. Use the `workdir` parameter if you need to run a command in a different directory. AVOID using `cd <directory> && <command>` patterns - use `workdir` instead.",
+    commandSection: bashCommandSection(chain, limits, defaultTimeoutMs),
+    gitCommands: "bash commands",
+    gitCommandRestriction: "git bash commands",
+    createPrInstruction:
+      "Create PR using gh pr create with the format below. Use a HEREDOC to pass the body to ensure correct formatting.",
+    createPrExample: `gh pr create --title "the pr title" --body "$(cat <<'EOF'
+## Summary
+<1-3 bullet points>`,
+  }
+}
+
+export function render(name: string, platform: NodeJS.Platform, limits: Limits, defaultTimeoutMs: number) {
+  const selected = profile(name, platform, limits, defaultTimeoutMs)
+  return {
+    description: renderPrompt(DESCRIPTION, {
+      intro: selected.intro,
+      os: platform,
+      shell: name,
+      tmp: Global.Path.tmp,
+      workdirSection: selected.workdirSection,
+      commandSection: selected.commandSection,
+      gitCommands: selected.gitCommands,
+      toolName: ShellID.ToolID,
+      gitCommandRestriction: selected.gitCommandRestriction,
+      createPrInstruction: selected.createPrInstruction,
+      createPrExample: selected.createPrExample,
+    }),
+    parameters: parameterSchema(),
+  }
+}
+
+export * as ShellPrompt from "./prompt"

package/src/tool/shell/shell.txt

@@ -0,0 +1,21 @@
+${intro}
+
+Be aware: OS: ${os}, Shell: ${shell}
+
+${workdirSection}
+
+Use `${tmp}` for temporary work outside the workspace. This directory has already been created, already exists, and is pre-approved for external directory access.
+
+IMPORTANT: This tool is for terminal operations like git, npm, docker, etc. DO NOT use it for file operations (reading, writing, editing, searching, finding files) - use the specialized tools for this instead.
+
+${commandSection}
+
+# Git and GitHub
+- Only commit, amend, push, or create PRs when explicitly requested.
+- Before committing, inspect `git status`, `git diff`, and `git log --oneline -10`; stage only intended files and never commit secrets.
+- Write a concise commit message that matches the repo style.
+- Do not update git config, skip hooks, use interactive `-i`, force-push, or create empty commits unless explicitly requested.
+- If a commit fails or hooks reject it, fix the issue and create a new commit; do not amend the failed commit.
+- Before creating a PR, inspect status, diff, remote tracking, recent commits, and the diff from the base branch.
+- Review all commits included in the PR, not just the latest commit.
+- Use `gh` for GitHub tasks, including PRs, issues, checks, and releases; return the PR URL when done.