@link-assistant/agent 0.18.2 → 0.19.0

package/src/file/watcher.ts

@@ -1,10 +1,10 @@
 import z from 'zod';
 import { Bus } from '../bus';
-import { Flag } from '../flag/flag';
+import { config } from '../config/config';
 import { Instance } from '../project/instance';
 import { Log } from '../util/log';
 import { FileIgnore } from './ignore';
-import { Config } from '../config/config';
+import { Config } from '../config/file-config';
 // @ts-ignore
 import { createWrapper } from '@parcel/watcher/wrapper';
 import { lazy } from '../util/lazy';
@@ -83,7 +83,7 @@ export namespace FileWatcher {
   );
 
   export function init() {
-    if (!Flag.OPENCODE_EXPERIMENTAL_WATCHER) return;
+    if (!config.experimentalWatcher) return;
     state();
   }
 }

package/src/format/index.ts

@@ -5,7 +5,7 @@ import path from 'path';
 import z from 'zod';
 
 import * as Formatter from './formatter';
-import { Config } from '../config/config';
+import { Config } from '../config/file-config';
 import { mergeDeep } from 'remeda';
 import { Instance } from '../project/instance';
 

package/src/index.js

@@ -1,5 +1,11 @@
 #!/usr/bin/env bun
-import { Flag } from './flag/flag.ts';
+import {
+  config,
+  initConfig,
+  isVerbose,
+  setVerbose,
+  getConfigSnapshot,
+} from './config/config.ts';
 import { setProcessName } from './cli/process-name.ts';
 setProcessName('agent');
 import { Server } from './server/server.ts';
@@ -249,7 +255,7 @@ async function runAgentMode(argv, request) {
     workingDirectory: process.cwd(),
     scriptPath: import.meta.path,
   }));
-  if (Flag.OPENCODE_DRY_RUN) {
+  if (config.dryRun) {
     Log.Default.info(() => ({
       message: 'Dry run mode enabled',
       mode: 'dry-run',
@@ -336,7 +342,7 @@ async function runContinuousAgentMode(argv) {
     workingDirectory: process.cwd(),
     scriptPath: import.meta.path,
   }));
-  if (Flag.OPENCODE_DRY_RUN) {
+  if (config.dryRun) {
     Log.Default.info(() => ({
       message: 'Dry run mode enabled',
       mode: 'dry-run',
@@ -608,7 +614,7 @@ async function main() {
         handler: async (argv) => {
           // Check both CLI flag and environment variable for compact JSON mode
           const compactJson =
-            argv['compact-json'] === true || Flag.COMPACT_JSON();
+            argv['compact-json'] === true || config.compactJson;
 
           // Check if --prompt flag was provided
           if (argv.prompt) {
@@ -767,49 +773,50 @@ async function main() {
           await runAgentMode(argv, request);
         },
       })
-      // Initialize logging and flags early for all CLI commands
+      // Initialize centralized config and flags from CLI args + env vars + .lenv.
+      // Uses lino-arguments getenv() for env var resolution (case-insensitive,
+      // type-preserving, .lenv support).
+      // See: https://github.com/link-foundation/lino-arguments
+      // See: https://github.com/link-assistant/agent/issues/227
       .middleware(async (argv) => {
-        const isCompact = argv['compact-json'] === true || Flag.COMPACT_JSON();
+        // Initialize global config using makeConfig from lino-arguments.
+        // Resolves CLI args + env vars + .lenv files in one place.
+        // After this call, the global `config` variable is fully resolved.
+        // See: https://github.com/link-foundation/lino-arguments
+        initConfig();
+
+        // Override compact-json from argv if explicitly set.
+        if (argv['compact-json'] === true) {
+          config.compactJson = true;
+        }
+        const isCompact = config.compactJson;
         if (isCompact) {
           setCompactJson(true);
         }
-        if (argv.verbose) {
-          Flag.setVerbose(true);
-        }
-        if (argv['dry-run']) {
-          Flag.setDryRun(true);
-        }
-        if (argv['generate-title'] === true) {
-          Flag.setGenerateTitle(true);
-        }
-        // output-response-model is enabled by default, only set if explicitly disabled
-        if (argv['output-response-model'] === false) {
-          Flag.setOutputResponseModel(false);
-        }
-        // summarize-session is enabled by default, only set if explicitly disabled
-        if (argv['summarize-session'] === false) {
-          Flag.setSummarizeSession(false);
-        } else {
-          Flag.setSummarizeSession(true);
-        }
-        // retry-on-rate-limits is enabled by default, only set if explicitly disabled
-        if (argv['retry-on-rate-limits'] === false) {
-          Flag.setRetryOnRateLimits(false);
+
+        // Sync verbose to env var for subprocess resilience.
+        if (config.verbose) {
+          setVerbose(true);
         }
+
+        // Initialize logging.
         await Log.init({
-          print: Flag.OPENCODE_VERBOSE,
-          level: Flag.OPENCODE_VERBOSE ? 'DEBUG' : 'INFO',
+          print: isVerbose(),
+          level: isVerbose() ? 'DEBUG' : 'INFO',
           compactJson: isCompact,
         });
 
+        // Always log the resolved configuration as JSON.
+        // This is critical for debugging — shows exactly what config was resolved
+        // from CLI args, env vars, and .lenv files combined.
+        Log.Default.info(() => ({
+          type: 'config',
+          message: 'Agent configuration resolved',
+          source: 'lino-arguments (CLI args > env vars > .lenv > defaults)',
+          config: getConfigSnapshot(),
+        }));
+
         // Global fetch monkey-patch for verbose HTTP logging (#221).
-        // This catches any HTTP calls that go through globalThis.fetch directly,
-        // including non-provider calls (auth, config, tools) that may not have
-        // their own createVerboseFetch wrapper. The provider-level wrapper in
-        // provider.ts getSDK() also logs independently — both mechanisms are
-        // kept active to maximize HTTP observability in --verbose mode.
-        // See: https://github.com/link-assistant/agent/issues/221
-        // See: https://github.com/link-assistant/agent/issues/217
         if (!globalThis.__agentVerboseFetchInstalled) {
           globalThis.fetch = createVerboseFetch(globalThis.fetch, {
             caller: 'global',

package/src/json-standard/index.ts

@@ -6,11 +6,11 @@
  * - claude: Claude CLI stream-json format - NDJSON (newline-delimited JSON)
  *
  * Output goes to stdout for normal messages, stderr for errors.
- * Use AGENT_CLI_COMPACT env var or --compact-json flag for NDJSON output.
+ * Use LINK_ASSISTANT_AGENT_COMPACT_JSON env var or --compact-json flag for NDJSON output.
  */
 
 import { EOL } from 'os';
-import { Flag } from '../flag/flag';
+import { config } from '../config/config';
 
 export type JsonStandard = 'opencode' | 'claude';
 
@@ -50,7 +50,7 @@ export interface ClaudeEvent {
 
 /**
  * Serialize JSON output based on the selected standard
- * Respects AGENT_CLI_COMPACT env var for OpenCode format
+ * Respects LINK_ASSISTANT_AGENT_COMPACT_JSON env var for OpenCode format
  */
 export function serializeOutput(
   event: OpenCodeEvent | ClaudeEvent,
@@ -60,8 +60,8 @@ export function serializeOutput(
     // NDJSON format - always compact, one line
     return JSON.stringify(event) + EOL;
   }
-  // OpenCode format - compact if AGENT_CLI_COMPACT is set
-  if (Flag.COMPACT_JSON()) {
+  // OpenCode format - compact if LINK_ASSISTANT_AGENT_COMPACT_JSON is set
+  if (config.compactJson) {
     return JSON.stringify(event) + EOL;
   }
   return JSON.stringify(event, null, 2) + EOL;

package/src/mcp/index.ts

@@ -3,7 +3,8 @@ import { type Tool } from 'ai';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { Config } from '../config/config';
+import { Config } from '../config/file-config';
+import { config } from '../config/config';
 import { Log } from '../util/log';
 import { NamedError } from '../util/error';
 import z from 'zod/v4';
@@ -89,23 +90,15 @@ export namespace MCP {
       const status: Record<string, Status> = {};
       const timeoutConfigs: Record<string, TimeoutConfig> = {};
 
-      // Determine global timeout defaults from config and environment variables
-      const envDefaultTimeout = process.env.MCP_DEFAULT_TOOL_CALL_TIMEOUT
-        ? parseInt(process.env.MCP_DEFAULT_TOOL_CALL_TIMEOUT, 10)
-        : undefined;
-      const envMaxTimeout = process.env.MCP_MAX_TOOL_CALL_TIMEOUT
-        ? parseInt(process.env.MCP_MAX_TOOL_CALL_TIMEOUT, 10)
-        : undefined;
-
+      // Determine global timeout defaults from config and environment variables.
+      // Uses config.mcp*() which reads from centralized AgentConfig (lino-arguments).
       const globalDefaults: GlobalTimeoutDefaults = {
         defaultTimeout:
           cfg.mcp_defaults?.tool_call_timeout ??
-          envDefaultTimeout ??
-          BUILTIN_DEFAULT_TOOL_CALL_TIMEOUT,
+          config.mcpDefaultToolCallTimeout,
         maxTimeout:
           cfg.mcp_defaults?.max_tool_call_timeout ??
-          envMaxTimeout ??
-          BUILTIN_MAX_TOOL_CALL_TIMEOUT,
+          config.mcpMaxToolCallTimeout,
       };
 
       await Promise.all(

package/src/project/bootstrap.ts

@@ -1,7 +1,6 @@
 import { Format } from '../format';
 import { FileWatcher } from '../file/watcher';
 import { File } from '../file';
-import { Flag } from '../flag/flag';
 import { Project } from './project';
 import { Bus } from '../bus';
 import { Command } from '../command';

package/src/project/project.ts

@@ -4,7 +4,6 @@ import path from 'path';
 import { $ } from 'bun';
 import { Storage } from '../storage/storage';
 import { Log } from '../util/log';
-import { Flag } from '../flag/flag';
 
 export namespace Project {
   const log = Log.create({ service: 'project' });

package/src/provider/provider.ts

@@ -1,6 +1,6 @@
 import z from 'zod';
 import path from 'path';
-import { Config } from '../config/config';
+import { Config } from '../config/file-config';
 import { mergeDeep, sortBy } from 'remeda';
 import { NoSuchModelError, type LanguageModel, type Provider as SDK } from 'ai';
 import { Log } from '../util/log';
@@ -12,7 +12,7 @@ import { ClaudeOAuth } from '../auth/claude-oauth';
 import { AuthPlugins } from '../auth/plugins';
 import { Instance } from '../project/instance';
 import { Global } from '../global';
-import { Flag } from '../flag/flag';
+import { config, isVerbose } from '../config/config';
 import { iife } from '../util/iife';
 import { createEchoModel } from './echo';
 import { createCacheModel } from './cache';
@@ -647,7 +647,7 @@ export namespace Provider {
     'link-assistant': async () => {
       // Echo provider is always available - no external dependencies needed
       return {
-        autoload: Flag.OPENCODE_DRY_RUN, // Auto-load only in dry-run mode
+        autoload: config.dryRun, // Auto-load only in dry-run mode
         async getModel(_sdk: any, modelID: string) {
           // Return our custom echo model that implements LanguageModelV1
           return createEchoModel(modelID);
@@ -1124,7 +1124,7 @@ export namespace Provider {
           .filter(
             ([, model]) =>
               ((!model.experimental && model.status !== 'alpha') ||
-                Flag.OPENCODE_ENABLE_EXPERIMENTAL_MODELS) &&
+                config.enableExperimentalModels) &&
               model.status !== 'deprecated'
           )
       );
@@ -1220,7 +1220,7 @@ export namespace Provider {
           pkg,
           globalVerboseFetchInstalled:
             !!globalThis.__agentVerboseFetchInstalled,
-          verboseAtCreation: Flag.OPENCODE_VERBOSE,
+          verboseAtCreation: isVerbose(),
         });
 
         options['fetch'] = async (
@@ -1228,9 +1228,11 @@ export namespace Provider {
           init?: RequestInit
         ): Promise<Response> => {
           // Check verbose flag at call time — not at SDK creation time.
-          // This ensures --verbose works even when the flag is set after SDK creation.
+          // Uses isVerbose() with env var fallback for resilience against
+          // flag state loss in subprocess/module-reload scenarios.
           // See: https://github.com/link-assistant/agent/issues/206
-          if (!Flag.OPENCODE_VERBOSE) {
+          // See: https://github.com/link-assistant/agent/issues/227
+          if (!isVerbose()) {
             return innerFetch(input, init);
           }
 
@@ -1787,7 +1789,7 @@ export namespace Provider {
     // In dry-run mode, use the echo provider by default
     // This allows testing round-trips and multi-turn conversations without API costs
     // @see https://github.com/link-assistant/agent/issues/89
-    if (Flag.OPENCODE_DRY_RUN) {
+    if (config.dryRun) {
       log.info('dry-run mode enabled, using echo provider as default');
       return {
         providerID: 'link-assistant',

package/src/provider/retry-fetch.ts

@@ -1,5 +1,5 @@
 import { Log } from '../util/log';
-import { Flag } from '../flag/flag';
+import { config } from '../config/config';
 
 /**
  * Custom fetch wrapper that handles rate limits (HTTP 429) using time-based retry logic.
@@ -8,8 +8,8 @@ import { Flag } from '../flag/flag';
  * retry mechanism can interfere. It respects:
  * - retry-after headers (both seconds and HTTP date formats)
  * - retry-after-ms header for millisecond precision
- * - AGENT_RETRY_TIMEOUT for global time-based retry limit
- * - AGENT_MAX_RETRY_DELAY for maximum single retry wait time
+ * - LINK_ASSISTANT_AGENT_RETRY_TIMEOUT for global time-based retry limit
+ * - LINK_ASSISTANT_AGENT_MAX_RETRY_DELAY for maximum single retry wait time
  *
  * Problem solved:
  * The AI SDK's internal retry uses a fixed count (default 3 attempts) and ignores
@@ -40,7 +40,7 @@ export namespace RetryFetch {
   // Minimum retry interval to prevent rapid retries (default: 30 seconds)
   // Can be configured via AGENT_MIN_RETRY_INTERVAL env var
   function getMinRetryInterval(): number {
-    return Flag.MIN_RETRY_INTERVAL();
+    return config.minRetryInterval * 1000;
   }
 
   /**
@@ -194,7 +194,7 @@ export namespace RetryFetch {
    *
    * This controller is NOT connected to the request's AbortSignal, so it won't be
    * affected by provider timeouts (default 5 minutes) or stream timeouts.
-   * It only respects the global AGENT_RETRY_TIMEOUT.
+   * It only respects the global LINK_ASSISTANT_AGENT_RETRY_TIMEOUT.
    *
    * However, it DOES check the user's abort signal periodically (every 10 seconds)
    * to allow user cancellation during long rate limit waits.
@@ -217,7 +217,7 @@ export namespace RetryFetch {
     const controller = new AbortController();
     const timers: NodeJS.Timeout[] = [];
 
-    // Set a timeout based on the global AGENT_RETRY_TIMEOUT (not provider timeout)
+    // Set a timeout based on the global LINK_ASSISTANT_AGENT_RETRY_TIMEOUT (not provider timeout)
     const globalTimeoutId = setTimeout(() => {
       controller.abort(
         new DOMException(
@@ -306,7 +306,7 @@ export namespace RetryFetch {
    * 3. Waits for the specified duration (respecting global timeout)
    * 4. Retries the request
    *
-   * If retry-after exceeds AGENT_RETRY_TIMEOUT, the original 429 response is returned
+   * If retry-after exceeds LINK_ASSISTANT_AGENT_RETRY_TIMEOUT, the original 429 response is returned
    * to let higher-level error handling take over.
    *
    * @param options Configuration options
@@ -322,8 +322,8 @@ export namespace RetryFetch {
     ): Promise<Response> {
       let attempt = 0;
       const startTime = Date.now();
-      const maxRetryTimeout = Flag.RETRY_TIMEOUT() * 1000;
-      const maxBackoffDelay = Flag.MAX_RETRY_DELAY();
+      const maxRetryTimeout = config.retryTimeout * 1000;
+      const maxBackoffDelay = config.maxRetryDelay * 1000;
 
       while (true) {
         attempt++;
@@ -371,7 +371,7 @@ export namespace RetryFetch {
         }
 
         // If retry on rate limits is disabled, return 429 immediately
-        if (!Flag.RETRY_ON_RATE_LIMITS) {
+        if (!config.retryOnRateLimits) {
           log.info(() => ({
             message:
               'rate limit retry disabled (--no-retry-on-rate-limits), returning 429',
@@ -442,7 +442,7 @@ export namespace RetryFetch {
         // Wait before retrying using ISOLATED signal
         // This is critical for issue #183: Rate limit waits can be hours long (e.g., 15 hours),
         // but provider timeouts are typically 5 minutes. By using an isolated AbortController
-        // that only respects AGENT_RETRY_TIMEOUT, we prevent the provider timeout from
+        // that only respects LINK_ASSISTANT_AGENT_RETRY_TIMEOUT, we prevent the provider timeout from
         // aborting long rate limit waits.
         //
         // The isolated signal periodically checks the user's abort signal (every 10 seconds)

package/src/session/agent.js

@@ -211,8 +211,10 @@ export class Agent {
       ...data,
     };
     // Pretty-print JSON for human readability, compact for programmatic use
-    // Use AGENT_CLI_COMPACT=1 for compact output (tests, automation)
-    const compact = process.env.AGENT_CLI_COMPACT === '1';
+    // Use LINK_ASSISTANT_AGENT_COMPACT_JSON=1 for compact output (tests, automation)
+    const compact =
+      process.env.LINK_ASSISTANT_AGENT_COMPACT_JSON === 'true' ||
+      process.env.LINK_ASSISTANT_AGENT_COMPACT_JSON === '1';
     process.stdout.write(
       `${compact ? JSON.stringify(event) : JSON.stringify(event, null, 2)}\n`
     );

package/src/session/compaction.ts

@@ -9,7 +9,7 @@ import { Bus } from '../bus';
 import z from 'zod';
 import type { ModelsDev } from '../provider/models';
 import { SessionPrompt } from './prompt';
-import { Flag } from '../flag/flag';
+import { config, isVerbose } from '../config/config';
 import { Token } from '../util/token';
 import { Log } from '../util/log';
 import { ProviderTransform } from '../provider/transform';
@@ -98,7 +98,7 @@ export namespace SessionCompaction {
     compactionModel?: CompactionModelConfig;
     compactionModelContextLimit?: number;
   }) {
-    if (Flag.OPENCODE_DISABLE_AUTOCOMPACT) return false;
+    if (config.disableAutocompact) return false;
     const baseModelContextLimit = input.model.limit.context;
     if (baseModelContextLimit === 0) return false;
     const count =
@@ -180,7 +180,7 @@ export namespace SessionCompaction {
   // calls. then erases output of previous tool calls. idea is to throw away old
   // tool calls that are no longer relevant.
   export async function prune(input: { sessionID: string }) {
-    if (Flag.OPENCODE_DISABLE_PRUNE) return;
+    if (config.disablePrune) return;
     log.info(() => ({ message: 'pruning' }));
     const msgs = await Session.messages({ sessionID: input.sessionID });
     let total = 0;
@@ -240,7 +240,7 @@ export namespace SessionCompaction {
       input.model.providerID,
       input.model.modelID
     );
-    if (Flag.OPENCODE_VERBOSE) {
+    if (isVerbose()) {
       log.info(() => ({
         message: 'compaction model loaded',
         providerID: model.providerID,
@@ -303,7 +303,7 @@ export namespace SessionCompaction {
     // Defensive check: ensure modelMessages is iterable (AI SDK 6.0.1 compatibility fix)
     const safeModelMessages = Array.isArray(modelMessages) ? modelMessages : [];
 
-    if (Flag.OPENCODE_VERBOSE) {
+    if (isVerbose()) {
       log.info(() => ({
         message: 'compaction streamText call',
         providerID: model.providerID,

package/src/session/index.ts

@@ -2,8 +2,8 @@ import { Decimal } from 'decimal.js';
 import z from 'zod';
 import { type LanguageModelUsage, type ProviderMetadata } from 'ai';
 import { Bus } from '../bus';
-import { Config } from '../config/config';
-import { Flag } from '../flag/flag';
+import { Config } from '../config/file-config';
+import { isVerbose } from '../config/config';
 import { Identifier } from '../id/id';
 import type { ModelsDev } from '../provider/models';
 import { Storage } from '../storage/storage';
@@ -35,7 +35,7 @@ export namespace Session {
    */
   export const toDecimal = (value: unknown, context?: string): Decimal => {
     // Log input data in verbose mode to help identify issues
-    if (Flag.OPENCODE_VERBOSE) {
+    if (isVerbose()) {
       log.debug(() => ({
         message: 'toDecimal input',
         context,
@@ -51,7 +51,7 @@ export namespace Session {
       const result = new Decimal(value as any);
 
       // Log successful conversion in verbose mode
-      if (Flag.OPENCODE_VERBOSE) {
+      if (isVerbose()) {
         log.debug(() => ({
           message: 'toDecimal success',
           context,
@@ -62,7 +62,7 @@ export namespace Session {
       return result;
     } catch (error) {
       // Log the error and return Decimal(NaN)
-      if (Flag.OPENCODE_VERBOSE) {
+      if (isVerbose()) {
         log.debug(() => ({
           message: 'toDecimal error - returning Decimal(NaN)',
           context,
@@ -397,7 +397,7 @@ export namespace Session {
    */
   export const toNumber = (value: unknown, context?: string): number => {
     // Log input data in verbose mode to help identify issues
-    if (Flag.OPENCODE_VERBOSE) {
+    if (isVerbose()) {
       log.debug(() => ({
         message: 'toNumber input',
         context,
@@ -412,7 +412,7 @@ export namespace Session {
       // These are expected for optional fields like cachedInputTokens, reasoningTokens
       // See: https://github.com/link-assistant/agent/issues/127
       if (value === undefined || value === null) {
-        if (Flag.OPENCODE_VERBOSE) {
+        if (isVerbose()) {
           log.debug(() => ({
             message: 'toNumber received undefined/null, returning 0',
             context,
@@ -432,7 +432,7 @@ export namespace Session {
         typeof (value as { total: unknown }).total === 'number'
       ) {
         const result = (value as { total: number }).total;
-        if (Flag.OPENCODE_VERBOSE) {
+        if (isVerbose()) {
           log.debug(() => ({
             message: 'toNumber extracted total from object',
             context,
@@ -452,7 +452,7 @@ export namespace Session {
       }
 
       // Log successful conversion in verbose mode
-      if (Flag.OPENCODE_VERBOSE) {
+      if (isVerbose()) {
         log.debug(() => ({
           message: 'toNumber success',
           context,
@@ -463,7 +463,7 @@ export namespace Session {
       return result;
     } catch (error) {
       // Log the error and return NaN
-      if (Flag.OPENCODE_VERBOSE) {
+      if (isVerbose()) {
         log.debug(() => ({
           message: 'toNumber error - returning NaN',
           context,
@@ -493,7 +493,7 @@ export namespace Session {
    */
   export const toFinishReason = (value: unknown): string => {
     // Log input data in verbose mode to help identify issues
-    if (Flag.OPENCODE_VERBOSE) {
+    if (isVerbose()) {
       log.debug(() => ({
         message: 'toFinishReason input',
         valueType: typeof value,
@@ -518,7 +518,7 @@ export namespace Session {
 
       // Try common field names that might contain the reason
       if (typeof obj.type === 'string') {
-        if (Flag.OPENCODE_VERBOSE) {
+        if (isVerbose()) {
           log.debug(() => ({
             message: 'toFinishReason extracted type from object',
             result: obj.type,
@@ -528,7 +528,7 @@ export namespace Session {
       }
 
       if (typeof obj.finishReason === 'string') {
-        if (Flag.OPENCODE_VERBOSE) {
+        if (isVerbose()) {
           log.debug(() => ({
             message: 'toFinishReason extracted finishReason from object',
             result: obj.finishReason,
@@ -538,7 +538,7 @@ export namespace Session {
       }
 
       if (typeof obj.reason === 'string') {
-        if (Flag.OPENCODE_VERBOSE) {
+        if (isVerbose()) {
           log.debug(() => ({
             message: 'toFinishReason extracted reason from object',
             result: obj.reason,
@@ -550,7 +550,7 @@ export namespace Session {
       // Handle AI SDK unified/raw format: {unified: "tool-calls", raw: "tool_calls"}
       // See: https://github.com/link-assistant/agent/issues/129
       if (typeof obj.unified === 'string') {
-        if (Flag.OPENCODE_VERBOSE) {
+        if (isVerbose()) {
           log.debug(() => ({
             message: 'toFinishReason extracted unified from object',
             result: obj.unified,
@@ -560,7 +560,7 @@ export namespace Session {
       }
 
       // If we can't extract a specific field, return JSON representation
-      if (Flag.OPENCODE_VERBOSE) {
+      if (isVerbose()) {
         log.debug(() => ({
           message: 'toFinishReason could not extract string, using JSON',
           result: JSON.stringify(value),
@@ -602,7 +602,7 @@ export namespace Session {
       }
 
       // Log raw usage data in verbose mode for debugging
-      if (Flag.OPENCODE_VERBOSE) {
+      if (isVerbose()) {
         log.debug(() => ({
           message: 'getUsage called with raw data',
           rawUsage: JSON.stringify(input.usage),
@@ -642,7 +642,7 @@ export namespace Session {
       // If standard usage is empty but openrouter metadata has usage, use it as source
       let effectiveUsage = input.usage;
       if (standardUsageIsEmpty && openrouterUsage) {
-        if (Flag.OPENCODE_VERBOSE) {
+        if (isVerbose()) {
           log.debug(() => ({
             message:
               'Standard usage empty, falling back to openrouter metadata',
@@ -682,7 +682,7 @@ export namespace Session {
           anthropicUsage &&
           (anthropicUsage.input_tokens || anthropicUsage.output_tokens)
         ) {
-          if (Flag.OPENCODE_VERBOSE) {
+          if (isVerbose()) {
             log.debug(() => ({
               message:
                 'Standard usage empty, falling back to anthropic provider metadata',

package/src/session/processor.ts

@@ -16,7 +16,7 @@ import { SessionSummary } from './summary';
 import { Bus } from '../bus';
 import { SessionRetry } from './retry';
 import { SessionStatus } from './status';
-import { Flag } from '../flag/flag';
+import { config, isVerbose } from '../config/config';
 import { SessionCompaction } from './compaction';
 
 export namespace SessionProcessor {
@@ -356,7 +356,7 @@ export namespace SessionProcessor {
                   // Build model info if --output-response-model flag is enabled
                   // @see https://github.com/link-assistant/agent/issues/179
                   const modelInfo: MessageV2.ModelInfo | undefined =
-                    Flag.OUTPUT_RESPONSE_MODEL
+                    config.outputResponseModel
                       ? {
                           providerID: input.providerID,
                           requestedModelID: input.model.id,
@@ -374,7 +374,7 @@ export namespace SessionProcessor {
                     model: input.model,
                   });
 
-                  if (Flag.OPENCODE_VERBOSE && contextDiag) {
+                  if (isVerbose() && contextDiag) {
                     log.info(() => ({
                       message: 'step-finish context diagnostics',
                       providerID: input.providerID,
@@ -547,7 +547,7 @@ export namespace SessionProcessor {
                       ? SessionRetry.timeoutDelay(attempt)
                       : SessionRetry.delay(error, attempt);
               } catch (delayError) {
-                // If retry-after exceeds AGENT_RETRY_TIMEOUT, fail immediately
+                // If retry-after exceeds LINK_ASSISTANT_AGENT_RETRY_TIMEOUT, fail immediately
                 if (
                   delayError instanceof SessionRetry.RetryTimeoutExceededError
                 ) {