fix: convert single-line altimate_change markers to start/end pairs

The strict marker guard (`analyze.ts --markers --strict`) only credits lines
between a `start`/`end` pair; the single-line `// altimate_change —` comments
introduced in #980 and #1004 covered the comment itself but left the code
beneath unmarked, failing the release gate against v0.9.1. Wrap all five
flagged sites (mcp/index.ts, session/prompt.ts, session/tools.ts,
tool/registry.ts x2, session/prompt/default.txt) in proper pairs. No
behavior change.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: anandgupta42

packages/opencode/src/mcp/index.ts

@@ -277,11 +277,13 @@ interface State {
 export interface Interface {
   readonly status: () => Effect.Effect<Record<string, Status>>
   readonly clients: () => Effect.Effect<Record<string, MCPClient>>
-  // altimate_change — carry the original (pre-sanitize) client name so tool-source classification
-  // works from the real name, not the flattened `<client>_<tool>` key (see altimate/tool-source).
+  // altimate_change start — carry the original (pre-sanitize) client name so tool-source
+  // classification works from the real name, not the flattened `<client>_<tool>` key
+  // (see altimate/tool-source).
   readonly tools: () => Effect.Effect<Record<string, Tool & { client: string }>>
   readonly prompts: () => Effect.Effect<Record<string, PromptInfo & { client: string }>>
   readonly resources: () => Effect.Effect<Record<string, ResourceInfo & { client: string }>>
+  // altimate_change end
   readonly add: (name: string, mcp: ConfigMCPV1.Info) => Effect.Effect<{ status: Record<string, Status> | Status }>
   readonly connect: (name: string) => Effect.Effect<void, NotFoundError>
   readonly disconnect: (name: string) => Effect.Effect<void, NotFoundError>
@@ -1012,8 +1014,9 @@ export const layer = Layer.effect(
     }
 
     const tools = Effect.fn("MCP.tools")(function* () {
-      // altimate_change — values carry the original client name (see Interface.tools).
+      // altimate_change start — values carry the original client name (see Interface.tools).
       const result: Record<string, Tool & { client: string }> = {}
+      // altimate_change end
       const s = yield* InstanceState.get(state)
 
       const cfg = yield* cfgSvc.get()
@@ -1031,8 +1034,9 @@ export const layer = Layer.effect(
         const timeout = requestTimeout(s, clientName, mcpConfig, defaultTimeout)
         for (const mcpTool of listed) {
           const key = McpCatalog.sanitize(clientName) + "_" + McpCatalog.sanitize(mcpTool.name)
-          // altimate_change — attach the original client name for source classification downstream.
+          // altimate_change start — attach the original client name for source classification downstream.
           result[key] = Object.assign(McpCatalog.convertTool(mcpTool, client, timeout), { client: clientName })
+          // altimate_change end
         }
       }
       return result

packages/opencode/src/session/prompt.ts

@@ -71,9 +71,10 @@ import { registerAltimateValidators } from "../altimate/validators"
 registerAltimateValidators()
 import { Config } from "../config/config"
 import { Tracer } from "../altimate/observability/tracing"
-// altimate_change — stamp an authoritative tool source + humanized MCP title
+// altimate_change start — stamp an authoritative tool source + humanized MCP title
 import { stampRegistryToolSource, describeMcpTool } from "../altimate/tool-source"
 // altimate_change end
+// altimate_change end
 import { Telemetry } from "@/telemetry" // altimate_change — session telemetry
 
 // @ts-ignore
@@ -1609,9 +1610,10 @@ export namespace SessionPrompt {
               messageID: input.processor.message.id,
             })),
           }
-          // altimate_change — stamp authoritative tool source so clients render the right badge.
-          // Shared with SessionTools.resolve (session/tools.ts) so the two resolvers can't drift.
+          // altimate_change start — stamp authoritative tool source so clients render the right
+          // badge. Shared with SessionTools.resolve (session/tools.ts) so the resolvers can't drift.
           const stamped = stampRegistryToolSource(output, item)
+          // altimate_change end
           await Plugin.trigger(
             "tool.execute.after",
             {
@@ -1620,17 +1622,22 @@ export namespace SessionPrompt {
               callID: ctx.callID,
               args,
             },
+            // altimate_change start — plugins observe the source-stamped output
             stamped,
+            // altimate_change end
           )
+          // altimate_change start — return the source-stamped output
           return stamped
+          // altimate_change end
         },
       })
     }
 
+    // altimate_change start — split the original client name off the model-facing tool object so
+    // it's used only for source classification and never leaks into the schema sent to the model.
     for (const [key, entry] of Object.entries(await MCP.tools())) {
-      // altimate_change — split the original client name off the model-facing tool object so it's
-      // used only for source classification and never leaks into the tool schema sent to the model.
       const { client: clientName, ...item } = entry
+      // altimate_change end
       const execute = item.execute
       if (!execute) continue
 
@@ -1708,19 +1715,23 @@ export namespace SessionPrompt {
         }
 
         const truncated = await Truncate.output(textParts.join("\n\n"), {}, input.agent)
-        // altimate_change — authoritative source + readable title from the original client name,
-        // shared with SessionTools.resolve (session/tools.ts) so the two resolvers can't drift.
+        // altimate_change start — authoritative source + readable title from the original client
+        // name, shared with SessionTools.resolve (session/tools.ts) so the resolvers can't drift.
         const described = describeMcpTool(key, clientName)
+        // altimate_change end
         const metadata = {
           ...(result.metadata ?? {}),
           truncated: truncated.truncated,
           ...(truncated.truncated && { outputPath: truncated.outputPath }),
+          // altimate_change start — stamp the authoritative source badge
           source: described.source,
+          // altimate_change end
         }
 
         return {
-          // altimate_change — MCP tools have no native title; give a readable label
+          // altimate_change start — MCP tools have no native title; give a readable label
           title: described.title,
+          // altimate_change end
           metadata,
           output: truncated.content,
           attachments: attachments.map((attachment) => ({

packages/opencode/src/session/prompt/default.txt

@@ -6,7 +6,9 @@ If the user asks for help or wants to give feedback inform them of the following
 - /help: Get help with using Altimate Code
 - To give feedback, users should report the issue at https://github.com/AltimateAI/altimate-code/issues
 
+// altimate_change start — altimate docs URL
 When the user directly asks about Altimate Code (eg 'can altimate do...', 'does altimate have...') or asks in second person (eg 'are you able...', 'can you do...'), use the WebFetch tool to gather information to answer the question from Altimate Code docs. The list of available docs is available at https://help.altimate.ai/code
+// altimate_change end
 
 # Tone and style
 You should be concise, direct, and to the point. When you run a non-trivial bash command, you should explain what the command does and why you are running it, to make sure the user understands what you are doing (this is especially important when you are running a command that will make changes to the user's system).

packages/opencode/src/session/tools.ts

@@ -18,8 +18,9 @@ import { Session } from "./session"
 import { SessionProcessor } from "./processor"
 import { PartID } from "./schema"
 import { EffectBridge } from "@/effect/bridge"
-// altimate_change — shared tool-source stamping so this resolver can't drift from prompt.ts
+// altimate_change start — shared tool-source stamping so this resolver can't drift from prompt.ts
 import { stampRegistryToolSource, describeMcpTool } from "@/altimate/tool-source"
+// altimate_change end
 // altimate_change start — upstream_fix: ToolRegistry expects fork-branded model ids here
 import { ModelID } from "@/provider/schema"
 // altimate_change end
@@ -104,27 +105,33 @@ export const resolve = Effect.fn("SessionTools.resolve")(function* (input: {
                 messageID: input.processor.message.id,
               })),
             }
-            // altimate_change — stamp authoritative tool source (shared with prompt.ts resolveTools)
+            // altimate_change start — stamp authoritative tool source (shared with prompt.ts resolveTools)
             const stamped = stampRegistryToolSource(output, item)
+            // altimate_change end
             yield* plugin.trigger(
               "tool.execute.after",
               { tool: item.id, sessionID: ctx.sessionID, callID: ctx.callID, args },
+              // altimate_change start — plugins observe the source-stamped output
               stamped,
+              // altimate_change end
             )
+            // altimate_change start — propagate the source-stamped output
             if (options.abortSignal?.aborted) {
               yield* input.processor.completeToolCall(options.toolCallId, stamped)
             }
             return stamped
+            // altimate_change end
           }),
         )
       },
     })
   }
 
+  // altimate_change start — split the original client name off the model-facing tool object so
+  // it's used only for source classification and never leaks into the schema sent to the model.
   for (const [key, entry] of Object.entries(yield* mcp.tools())) {
-    // altimate_change — split the original client name off the model-facing tool object so it's
-    // used only for source classification and never leaks into the tool schema sent to the model.
     const { client: clientName, ...item } = entry
+    // altimate_change end
     const execute = item.execute
     if (!execute) continue
 
@@ -184,18 +191,23 @@ export const resolve = Effect.fn("SessionTools.resolve")(function* (input: {
           }
 
           const truncated = yield* truncate.output(textParts.join("\n\n"), {}, input.agent)
-          // altimate_change — authoritative source + readable title from the original client name,
-          // shared with prompt.ts resolveTools so the two resolvers can't drift.
+          // altimate_change start — authoritative source + readable title from the original client
+          // name, shared with prompt.ts resolveTools so the two resolvers can't drift.
           const described = describeMcpTool(key, clientName)
+          // altimate_change end
           const metadata = {
             ...result.metadata,
             truncated: truncated.truncated,
             ...(truncated.truncated && { outputPath: truncated.outputPath }),
+            // altimate_change start — stamp the authoritative source badge
             source: described.source,
+            // altimate_change end
           }
 
           const output = {
+            // altimate_change start — MCP tools have no native title; give a readable label
             title: described.title,
+            // altimate_change end
             metadata,
             output: truncated.content,
             attachments: attachments.map((attachment) => ({

packages/opencode/src/tool/registry.ts

@@ -240,10 +240,11 @@ export namespace ToolRegistry {
   function fromPlugin(id: string, def: ToolDefinition): Tool.Info {
     return {
       id,
-      // altimate_change — user custom tools (file-scanned) and third-party plugin tools both flow
-      // through here; mark them "external" so the tool-source badge stays neutral and never
+      // altimate_change start — user custom tools (file-scanned) and third-party plugin tools both
+      // flow through here; mark them "external" so the tool-source badge stays neutral and never
       // over-claims them as Altimate-owned.
       registrySource: "external",
+      // altimate_change end
       init: () =>
         legacyToInit({
           // altimate_change start — tolerate JSON-Schema-shaped legacy args (see argsToZodShape)
@@ -559,8 +560,9 @@ export namespace ToolRegistry {
           await Plugin.trigger("tool.definition", { toolID: t.id }, output)
           return {
             id: t.id,
-            // altimate_change — carry declared origin to the resolvers' source-badge stamping.
+            // altimate_change start — carry declared origin to the resolvers' source-badge stamping.
             registrySource: t.registrySource,
+            // altimate_change end
             // altimate_change start — upstream_fix: hide disabled runtime-gated tool schema fields.
             ...applyRuntimeToolSchemaFlags(t.id, tool, runtimeFlags),
             // altimate_change end

packages/opencode/src/tool/skill.ts

@@ -204,8 +204,9 @@ export const SkillTool = Tool.define("skill", async (ctx) => {
         metadata: {
           name: skill.name,
           dir,
-          // altimate_change — origin drives the source badge (see altimate/tool-source.ts skillToolSource)
+          // altimate_change start — origin drives the source badge (see altimate/tool-source.ts skillToolSource)
           skillOrigin,
+          // altimate_change end
         },
       }
       // altimate_change end