gsdd-cli 0.27.0 → 0.28.0

package/bin/adapters/claude.mjs

@@ -5,6 +5,7 @@ import {
   MAX_CHECKER_CYCLES,
   CHECKER_STATUSES,
 } from '../lib/plan-constants.mjs';
+import { localizeStateDirReferences } from '../lib/rendering.mjs';
 
 const CLAUDE_MODEL_PROFILES = {
   quality: 'opus',
@@ -36,7 +37,7 @@ ${delegateContent.trim()}
 `;
 }
 
-function renderClaudePlanSkill({ portableContractPath = '.agents/skills/gsdd-plan/SKILL.md' } = {}) {
+function renderClaudePlanSkill({ portableContractPath = '.agents/skills/gsdd-plan/SKILL.md', stateDirName = '.work' } = {}) {
   const contractSection = portableContractPath
     ? `Portable contract:
 - Read \`${portableContractPath}\` first. That file remains the canonical vendor-agnostic plan contract.
@@ -44,13 +45,13 @@ function renderClaudePlanSkill({ portableContractPath = '.agents/skills/gsdd-pla
 - If the portable skill says plan is still a stub, treat that as a portability-status warning for the generic surface, not as a stop signal for this Claude-native adapter path.`
     : `Workflow contract:
 - This globally installed skill is the canonical Claude-native \`gsdd-plan\` workflow contract.
-- Keep the workflow portable: use repo-local \`.planning/\` artifacts for project state and do not require repo-local \`.agents/skills/\` files to exist.
+- Keep the workflow portable: use repo-local \`.work/\` artifacts for project state and do not require repo-local \`.agents/skills/\` files to exist.
 - Do not claim that other runtimes have the same behavior unless their own adapters explicitly implement and prove it.`;
   const planningContract = portableContractPath
     ? `\`${portableContractPath}\``
     : 'this skill';
 
-  return `---
+  const content = `---
 name: gsdd-plan
 description: Claude-native Phase planning with fresh-context plan checking for GSDD
 argument-hint: [phase-number]
@@ -67,25 +68,25 @@ Native Claude adapter rule:
 - Do NOT claim that other runtimes have the same behavior unless their own adapters explicitly implement and prove it.
 
 Execution flow:
-1. Read \`.planning/SPEC.md\`, \`.planning/ROADMAP.md\`, \`.planning/config.json\`, relevant phase research, and any existing phase plan files.
+1. Read \`.work/SPEC.md\`, \`.work/ROADMAP.md\`, \`.work/config.json\`, relevant phase research, and any existing phase plan files.
 2. Resolve the target phase from the command arguments. If no phase is provided, choose the first roadmap phase that is not complete.
 3. **Approach exploration** (before planning):
-   a. Check \`.planning/config.json\` for \`workflow.discuss\`. If \`false\` or missing, skip to step 4 and report \`reduced_alignment\` in the summary.
+   a. Check \`.work/config.json\` for \`workflow.discuss\`. If \`false\` or missing, skip to step 4 and report \`reduced_alignment\` in the summary.
    b. Check if \`{phase_dir}/{padded_phase}-APPROACH.md\` exists. If it does, offer the user: "Use existing" / "Update it" / "View it". If "Use existing", load decisions, then validate the alignment proof before step 4; proofless or invalid existing APPROACH.md must be updated, not silently trusted.
-   c. If no APPROACH.md exists (or user chose "Update"): invoke the native \`gsdd-approach-explorer\` subagent with the phase goal, requirement IDs, project config from \`.planning/config.json\` (especially \`workflow.discuss\`), SPEC locked decisions, phase research, and relevant codebase files.
+   c. If no APPROACH.md exists (or user chose "Update"): invoke the native \`gsdd-approach-explorer\` subagent with the phase goal, requirement IDs, project config from \`.work/config.json\` (especially \`workflow.discuss\`), SPEC locked decisions, phase research, and relevant codebase files.
    d. The explorer runs a GSD-style interactive conversation with the user (gray areas, research, deep-dive questions, assumptions) and writes APPROACH.md.
    e. Before planning, confirm APPROACH.md records all canonical proof fields: \`alignment_status\`, \`alignment_method\`, \`user_confirmed_at\`, \`explicit_skip_approved\`, \`skip_scope\`, \`skip_rationale\`, and \`confirmed_decisions\`. For \`alignment_status: user_confirmed\`, \`confirmed_decisions\` must name the locked decisions and skip fields may be \`false\`/\`N/A\`; for \`alignment_status: approved_skip\`, \`explicit_skip_approved: true\`, \`skip_scope\`, and \`skip_rationale\` must be substantive. Agent-only "No questions needed" is not valid proof under \`workflow.discuss: true\`.
    f. Load APPROACH.md decisions as locked constraints alongside SPEC.md decisions.
 4. Produce the initial phase plan according to ${planningContract}. Pass APPROACH.md decisions (if any) as locked constraints to the planner.
-5. If \`.planning/config.json\` has \`workflow.planCheck: false\`, stop after planner self-check and explicitly report reduced assurance. This only skips the independent checker; it does not skip the step 3 alignment-proof gate when \`workflow.discuss: true\`.
+5. If \`.work/config.json\` has \`workflow.planCheck: false\`, stop after planner self-check and explicitly report reduced assurance. This only skips the independent checker; it does not skip the step 3 alignment-proof gate when \`workflow.discuss: true\`.
 6. If \`workflow.planCheck: true\`, invoke the native \`gsdd-plan-checker\` subagent with fresh context.
 7. Pass only explicit inputs to the checker:
    - target phase goal and requirement IDs
-   - relevant locked decisions / deferred items from \`.planning/SPEC.md\`
-   - project config from \`.planning/config.json\`, especially \`workflow.discuss\` and \`workflow.planCheck\`
-   - approach decisions from \`.planning/phases/*-APPROACH.md\` (if exists)
+   - relevant locked decisions / deferred items from \`.work/SPEC.md\`
+   - project config from \`.work/config.json\`, especially \`workflow.discuss\` and \`workflow.planCheck\`
+   - approach decisions from \`.work/phases/*-APPROACH.md\` (if exists)
    - relevant phase research file(s)
-   - produced \`.planning/phases/*-PLAN.md\` file(s)
+   - produced \`.work/phases/*-PLAN.md\` file(s)
 8. Require the checker to return a single JSON object with this shape:
    {
      "status": "issues_found",
@@ -115,6 +116,7 @@ Return a concise orchestration summary:
 
 Never return raw checker JSON without summarizing it.
 `;
+  return localizeStateDirReferences(content, { stateDirName });
 }
 
 function renderClaudePlanCommand({ skillPath = '.claude/skills/gsdd-plan/SKILL.md' } = {}) {
@@ -133,7 +135,7 @@ Rules:
 `;
 }
 
-function createClaudeAdapter({ cwd, workflows, renderSkillContent, getDelegateContent, resolveRuntimeAgentModel }) {
+function createClaudeAdapter({ cwd, workflows, stateDirName = '.work', renderSkillContent, getDelegateContent, resolveRuntimeAgentModel }) {
   const skillsDir = join(cwd, '.claude', 'skills');
   const commandsDir = join(cwd, '.claude', 'commands');
   const agentsDir = join(cwd, '.claude', 'agents');
@@ -169,8 +171,8 @@ function createClaudeAdapter({ cwd, workflows, renderSkillContent, getDelegateCo
         const dir = join(skillsDir, workflow.name);
         mkdirSync(dir, { recursive: true });
         const content = workflow.name === 'gsdd-plan'
-          ? renderClaudePlanSkill()
-          : renderSkillContent(workflow);
+          ? renderClaudePlanSkill({ stateDirName })
+          : renderSkillContent(workflow, { stateDirName });
         writeFileSync(join(dir, 'SKILL.md'), content);
       }
 

package/bin/adapters/opencode.mjs

@@ -6,6 +6,7 @@ import {
   MAX_CHECKER_CYCLES,
   CHECKER_STATUSES,
 } from '../lib/plan-constants.mjs';
+import { localizeStateDirReferences } from '../lib/rendering.mjs';
 
 function expandHome(filePath) {
   if (!filePath) return filePath;
@@ -145,8 +146,8 @@ ${delegateContent.trim()}
 `;
 }
 
-function renderOpenCodePlanCommand({ skillPath = '.agents/skills/gsdd-plan/SKILL.md' } = {}) {
-  return `---
+function renderOpenCodePlanCommand({ skillPath = '.agents/skills/gsdd-plan/SKILL.md', stateDirName = '.work' } = {}) {
+  const content = `---
 description: OpenCode-native phase planning with fresh-context plan checking for GSDD
 subtask: false
 ---
@@ -165,25 +166,25 @@ Native OpenCode adapter rule:
 - Do NOT claim that other runtimes have the same behavior unless their own adapters explicitly implement and prove it.
 
 Execution flow:
-1. Read \`.planning/SPEC.md\`, \`.planning/ROADMAP.md\`, \`.planning/config.json\`, relevant phase research, and any existing phase plan files.
+1. Read \`.work/SPEC.md\`, \`.work/ROADMAP.md\`, \`.work/config.json\`, relevant phase research, and any existing phase plan files.
 2. Resolve the target phase from the command arguments. If no phase is provided, choose the first roadmap phase that is not complete.
 3. **Approach exploration** (before planning):
-   a. Check \`.planning/config.json\` for \`workflow.discuss\`. If \`false\` or missing, skip to step 4 and report \`reduced_alignment\` in the summary.
+   a. Check \`.work/config.json\` for \`workflow.discuss\`. If \`false\` or missing, skip to step 4 and report \`reduced_alignment\` in the summary.
    b. Check if \`{phase_dir}/{padded_phase}-APPROACH.md\` exists. If it does, offer the user: "Use existing" / "Update it" / "View it". If "Use existing", load decisions, then validate the alignment proof before step 4; proofless or invalid existing APPROACH.md must be updated, not silently trusted.
-   c. If no APPROACH.md exists (or user chose "Update"): invoke the \`gsdd-approach-explorer\` subagent with the phase goal, requirement IDs, project config from \`.planning/config.json\` (especially \`workflow.discuss\`), SPEC locked decisions, phase research, and relevant codebase files.
+   c. If no APPROACH.md exists (or user chose "Update"): invoke the \`gsdd-approach-explorer\` subagent with the phase goal, requirement IDs, project config from \`.work/config.json\` (especially \`workflow.discuss\`), SPEC locked decisions, phase research, and relevant codebase files.
    d. The explorer runs a GSD-style interactive conversation with the user (gray areas, research, deep-dive questions, assumptions) and writes APPROACH.md.
    e. Before planning, confirm APPROACH.md records all canonical proof fields: \`alignment_status\`, \`alignment_method\`, \`user_confirmed_at\`, \`explicit_skip_approved\`, \`skip_scope\`, \`skip_rationale\`, and \`confirmed_decisions\`. For \`alignment_status: user_confirmed\`, \`confirmed_decisions\` must name the locked decisions and skip fields may be \`false\`/\`N/A\`; for \`alignment_status: approved_skip\`, \`explicit_skip_approved: true\`, \`skip_scope\`, and \`skip_rationale\` must be substantive. Agent-only "No questions needed" is not valid proof under \`workflow.discuss: true\`.
    f. Load APPROACH.md decisions as locked constraints alongside SPEC.md decisions.
 4. Produce the initial phase plan according to \`${skillPath}\`. Pass APPROACH.md decisions (if any) as locked constraints to the planner.
-5. If \`.planning/config.json\` has \`workflow.planCheck: false\`, stop after planner self-check and explicitly report reduced assurance. This only skips the independent checker; it does not skip the step 3 alignment-proof gate when \`workflow.discuss: true\`.
+5. If \`.work/config.json\` has \`workflow.planCheck: false\`, stop after planner self-check and explicitly report reduced assurance. This only skips the independent checker; it does not skip the step 3 alignment-proof gate when \`workflow.discuss: true\`.
 6. If \`workflow.planCheck: true\`, invoke the hidden \`gsdd-plan-checker\` subagent with fresh context.
 7. Pass only explicit inputs to the checker:
    - target phase goal and requirement IDs
-   - relevant locked decisions / deferred items from \`.planning/SPEC.md\`
-   - project config from \`.planning/config.json\`, especially \`workflow.discuss\` and \`workflow.planCheck\`
-   - approach decisions from \`.planning/phases/*-APPROACH.md\` (if exists)
+   - relevant locked decisions / deferred items from \`.work/SPEC.md\`
+   - project config from \`.work/config.json\`, especially \`workflow.discuss\` and \`workflow.planCheck\`
+   - approach decisions from \`.work/phases/*-APPROACH.md\` (if exists)
    - relevant phase research file(s)
-   - produced \`.planning/phases/*-PLAN.md\` file(s)
+   - produced \`.work/phases/*-PLAN.md\` file(s)
 8. Require the checker to return a single JSON object with this shape:
    {
      "status": "issues_found",
@@ -213,11 +214,13 @@ Return a concise orchestration summary:
 
 Never return raw checker JSON without summarizing it.
 `;
+  return localizeStateDirReferences(content, { stateDirName });
 }
 
 function createOpenCodeAdapter({
   cwd,
   workflows,
+  stateDirName = '.work',
   renderOpenCodeCommandContent,
   getDelegateContent,
   getRuntimeModelOverride,
@@ -247,8 +250,8 @@ function createOpenCodeAdapter({
       mkdirSync(commandsDir, { recursive: true });
       for (const workflow of workflows) {
         const content = workflow.name === 'gsdd-plan'
-          ? renderOpenCodePlanCommand()
-          : renderOpenCodeCommandContent(workflow);
+          ? renderOpenCodePlanCommand({ stateDirName })
+          : renderOpenCodeCommandContent(workflow, { stateDirName });
         writeFileSync(
           join(commandsDir, `${workflow.name}.md`),
           content

package/bin/gsdd.mjs

@@ -11,19 +11,16 @@ import {
   upsertBoundedBlock,
   getDelegateContent,
 } from './lib/rendering.mjs';
-import { loadProjectModelConfig, getRuntimeModelOverride, resolveRuntimeAgentModel, cmdModels, cmdRigor } from './lib/models.mjs';
+import { loadProjectModelConfig, getRuntimeModelOverride, resolveRuntimeAgentModel, cmdModels, cmdRigor } from './lib/config.mjs';
 import { createCmdInit, createCmdUpdate, cmdHelp } from './lib/init.mjs';
 import { createCmdInstall } from './lib/global-install.mjs';
 import { cmdFindPhase, cmdVerify, cmdScaffold, cmdPhaseStatus } from './lib/phase.mjs';
 import { cmdFileOp } from './lib/file-ops.mjs';
 import { createCmdHealth } from './lib/health.mjs';
 import { cmdLifecyclePreflight } from './lib/lifecycle-preflight.mjs';
-import { cmdSessionFingerprint } from './lib/session-fingerprint.mjs';
-import { cmdUiProof } from './lib/ui-proof.mjs';
-import { cmdControlMap } from './lib/control-map.mjs';
-import { createCmdCloseoutReport } from './lib/closeout-report.mjs';
 import { createCmdNext } from './lib/next.mjs';
 import { resolveWorkspaceContext } from './lib/workspace-root.mjs';
+import { resolveStateDir } from './lib/state-dir.mjs';
 import { FRAMEWORK_VERSION, WORKFLOWS } from './lib/workflows.mjs';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -35,9 +32,11 @@ const IS_MAIN = process.argv[1] ? realpathSync(process.argv[1]) === realpathSync
 const [,, command, ...args] = process.argv;
 
 function createCliContext(cwd = process.cwd()) {
+  const state = resolveStateDir(cwd);
   return {
     cwd,
-    planningDir: join(cwd, '.planning'),
+    planningDir: state.dir,
+    stateDirName: state.name,
     distilledDir: DISTILLED_DIR,
     agentsDir: AGENTS_DIR,
     packageName: PACKAGE_JSON.name,
@@ -50,6 +49,7 @@ function createCliContext(cwd = process.cwd()) {
     adapters: createAdapterRegistry({
       cwd,
       workflows: WORKFLOWS,
+      stateDirName: state.name,
       renderAgentsBoundedBlock,
       renderAgentsFileContent,
       renderOpenCodeCommandContent,
@@ -67,7 +67,6 @@ const INIT_CONTEXT = createCliContext(process.cwd());
 const cmdInit = createCmdInit(INIT_CONTEXT);
 const cmdInstall = createCmdInstall(INIT_CONTEXT);
 const cmdHealth = createCmdHealth(INIT_CONTEXT);
-const cmdCloseoutReport = createCmdCloseoutReport(INIT_CONTEXT);
 const cmdNext = createCmdNext(INIT_CONTEXT);
 
 const cmdUpdate = (...updateArgs) => {
@@ -89,10 +88,6 @@ const COMMANDS = {
   next: cmdNext,
   'file-op': cmdFileOp,
   'lifecycle-preflight': cmdLifecyclePreflight,
-  'session-fingerprint': cmdSessionFingerprint,
-  'ui-proof': cmdUiProof,
-  'control-map': cmdControlMap,
-  'closeout-report': cmdCloseoutReport,
   'find-phase': cmdFindPhase,
   'phase-status': cmdPhaseStatus,
   verify: cmdVerify,
@@ -118,5 +113,13 @@ async function runCli(cliCommand = command, ...cliArgs) {
   await COMMANDS[cliCommand](...normalizedArgs);
 }
 
-if (IS_MAIN) await runCli();
-export { cmdHelp, cmdInit, cmdInstall, cmdUpdate, cmdModels, cmdRigor, cmdHealth, cmdNext, cmdFileOp, cmdLifecyclePreflight, cmdSessionFingerprint, cmdUiProof, cmdControlMap, cmdCloseoutReport, cmdFindPhase, cmdPhaseStatus, cmdVerify, cmdScaffold, runCli, FRAMEWORK_VERSION, createCliContext };
+if (IS_MAIN) {
+  await runCli();
+  // D-47: interactive prompts (raw-mode keypress pickers) can leave stdin
+  // referenced; release it so the process exits when work is done.
+  if (process.stdin.isTTY) {
+    process.stdin.pause();
+    if (typeof process.stdin.unref === 'function') process.stdin.unref();
+  }
+}
+export { cmdHelp, cmdInit, cmdInstall, cmdUpdate, cmdModels, cmdRigor, cmdHealth, cmdNext, cmdFileOp, cmdLifecyclePreflight, cmdFindPhase, cmdPhaseStatus, cmdVerify, cmdScaffold, runCli, FRAMEWORK_VERSION, createCliContext };

package/bin/lib/{models.mjs → config.mjs}

@@ -8,6 +8,7 @@ import { join } from 'path';
 import { CLAUDE_MODEL_PROFILES } from '../adapters/claude.mjs';
 import { detectOpenCodeConfiguredModel } from '../adapters/opencode.mjs';
 import { parseFlagValue, output } from './cli-utils.mjs';
+import { resolveStateDir } from './state-dir.mjs';
 
 export const DEFAULT_GIT_PROTOCOL = {
   branch: 'Follow the existing repo or team branching convention. Use a feature branch for significant changes when no convention exists.',
@@ -83,11 +84,15 @@ export function buildDefaultConfig({ autoAdvance = false } = {}) {
 }
 
 export function isProjectInitialized(cwd = process.cwd()) {
-  return existsSync(join(cwd, '.planning', 'config.json'));
+  return existsSync(join(resolveStateDir(cwd).dir, 'config.json'));
+}
+
+function configPathLabel(cwd = process.cwd()) {
+  return `${resolveStateDir(cwd).name}/config.json`;
 }
 
 export function loadProjectModelConfig(cwd = process.cwd()) {
-  const configPath = join(cwd, '.planning', 'config.json');
+  const configPath = join(resolveStateDir(cwd).dir, 'config.json');
   if (!existsSync(configPath)) return buildDefaultConfig();
 
   try {
@@ -96,35 +101,37 @@ export function loadProjectModelConfig(cwd = process.cwd()) {
       ...JSON.parse(readFileSync(configPath, 'utf-8')),
     };
   } catch (e) {
-    console.error(`WARNING: .planning/config.json is malformed (${e.message}). Using defaults.`);
+    console.error(`WARNING: ${configPathLabel(cwd)} is malformed (${e.message}). Using defaults.`);
     return buildDefaultConfig();
   }
 }
 
 function loadConfigForMutation(cwd = process.cwd()) {
-  const configPath = join(cwd, '.planning', 'config.json');
+  const state = resolveStateDir(cwd);
+  const configPath = join(state.dir, 'config.json');
+  const pathLabel = `${state.name}/config.json`;
   let raw;
   try {
     raw = readFileSync(configPath, 'utf-8');
   } catch (e) {
-    return { ok: false, error: `could not read config file (${e.message})` };
+    return { ok: false, pathLabel, error: `could not read config file (${e.message})` };
   }
   try {
-    return { ok: true, config: { ...buildDefaultConfig(), ...JSON.parse(raw) } };
+    return { ok: true, pathLabel, config: { ...buildDefaultConfig(), ...JSON.parse(raw) } };
   } catch (e) {
-    return { ok: false, error: `malformed JSON (${e.message})` };
+    return { ok: false, pathLabel, error: `malformed JSON (${e.message})` };
   }
 }
 
 export function ensureProjectConfig(cwd = process.cwd()) {
-  mkdirSync(join(cwd, '.planning'), { recursive: true });
+  mkdirSync(resolveStateDir(cwd).dir, { recursive: true });
   const config = loadProjectModelConfig(cwd);
   writeProjectConfig(config, cwd);
   return config;
 }
 
 export function writeProjectConfig(config, cwd = process.cwd()) {
-  const configPath = join(cwd, '.planning', 'config.json');
+  const configPath = join(resolveStateDir(cwd).dir, 'config.json');
   writeFileSync(configPath, JSON.stringify(config, null, 2));
 }
 
@@ -272,7 +279,7 @@ function cmdModelsProfile(profile) {
 
   const result = loadConfigForMutation();
   if (!result.ok) {
-    console.error(`ERROR: .planning/config.json is malformed (${result.error}). Fix the file manually before running model mutations.`);
+    console.error(`ERROR: ${result.pathLabel} is malformed (${result.error}). Fix the file manually before running model mutations.`);
     process.exitCode = 1;
     return;
   }
@@ -306,7 +313,7 @@ function cmdModelsAgentProfile(args) {
 
   const result = loadConfigForMutation();
   if (!result.ok) {
-    console.error(`ERROR: .planning/config.json is malformed (${result.error}). Fix the file manually before running model mutations.`);
+    console.error(`ERROR: ${result.pathLabel} is malformed (${result.error}). Fix the file manually before running model mutations.`);
     process.exitCode = 1;
     return;
   }
@@ -334,7 +341,7 @@ function cmdModelsClearAgentProfile(args) {
 
   const result = loadConfigForMutation();
   if (!result.ok) {
-    console.error(`ERROR: .planning/config.json is malformed (${result.error}). Fix the file manually before running model mutations.`);
+    console.error(`ERROR: ${result.pathLabel} is malformed (${result.error}). Fix the file manually before running model mutations.`);
     process.exitCode = 1;
     return;
   }
@@ -384,7 +391,7 @@ function cmdModelsSetRuntimeOverride(args) {
 
   const result = loadConfigForMutation();
   if (!result.ok) {
-    console.error(`ERROR: .planning/config.json is malformed (${result.error}). Fix the file manually before running model mutations.`);
+    console.error(`ERROR: ${result.pathLabel} is malformed (${result.error}). Fix the file manually before running model mutations.`);
     process.exitCode = 1;
     return;
   }
@@ -420,7 +427,7 @@ function cmdModelsClearRuntimeOverride(args) {
 
   const result = loadConfigForMutation();
   if (!result.ok) {
-    console.error(`ERROR: .planning/config.json is malformed (${result.error}). Fix the file manually before running model mutations.`);
+    console.error(`ERROR: ${result.pathLabel} is malformed (${result.error}). Fix the file manually before running model mutations.`);
     process.exitCode = 1;
     return;
   }
@@ -499,7 +506,7 @@ function cmdRigorSetProfile(level) {
   }
   const result = loadConfigForMutation();
   if (!result.ok) {
-    console.error(`ERROR: .planning/config.json is malformed (${result.error}). Fix the file manually before running rigor mutations.`);
+    console.error(`ERROR: ${result.pathLabel} is malformed (${result.error}). Fix the file manually before running rigor mutations.`);
     process.exitCode = 1;
     return;
   }
@@ -529,7 +536,7 @@ function cmdRigorSetStep(step, level) {
   }
   const result = loadConfigForMutation();
   if (!result.ok) {
-    console.error(`ERROR: .planning/config.json is malformed (${result.error}). Fix the file manually before running rigor mutations.`);
+    console.error(`ERROR: ${result.pathLabel} is malformed (${result.error}). Fix the file manually before running rigor mutations.`);
     process.exitCode = 1;
     return;
   }