tor-to-proposal 2.0.0 → 2.0.1

package/README.md

@@ -28,7 +28,9 @@ npx tor-to-proposal init
 ```
 
 That sets up your consultant profile (name, credentials, rates, master CV) at
-`~/.tor-to-proposal/profile.json`. Then use it with any AI assistant (Claude
+`.tor-to-proposal/profile.json` in the **current folder** (the legacy
+`~/.tor-to-proposal/profile.json` is still read if no local profile exists).
+Then use it with any AI assistant (Claude
 Desktop / Claude Code / Codex / ChatGPT) via the MCP server at
 `mcp/server.mjs`, or install the agent skill:
 

package/bin/bid-pack.mjs

@@ -12,13 +12,12 @@
 // GATES PRESERVED: pricing never runs without user numbers; GAP terms never
 // claimed; audit gates the final bytes. The orchestrator only automates plumbing.
 import fs from 'node:fs';
-import os from 'node:os';
 import path from 'node:path';
 import crypto from 'node:crypto';
 import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { fail, parseArgs, readText, writeOut, helpText, mdTable } from './lib.mjs';
-import { loadProfile } from './profile.mjs';
+import { loadProfile, profilePath } from './profile.mjs';
 
 const HELP = helpText('bid-pack', [
   'start  --tor <file.(pdf|docx|txt)> [--cv <file>] [--dir bid/] [--profile] [--no-cv-tailor]',
@@ -203,7 +202,7 @@ function start() {
     run('cv-gap.mjs', ['--tor', path.join(outDir, 'tor.txt'), '--cv', cvTxt, '--out', path.join(outDir, 'cv-gap-report.md')], { label: 'cv-gap' });
     state.steps.cvGap = { status: 'done' };
     if (!inDir('cv-tailored.md') && !args['no-cv-tailor']) {
-      const profFlag = (args.profile === undefined || args.profile === true) && fs.existsSync(path.join(os.homedir(), '.tor-to-proposal', 'profile.json')) ? ['--profile', path.join(os.homedir(), '.tor-to-proposal', 'profile.json')] : [];
+      const profFlag = (args.profile === undefined || args.profile === true) && loadProfile() ? ['--profile', profilePath()] : [];
       run('cv-tailor.mjs', ['build', '--cv', cvTxt, '--extract', path.join(outDir, 'tor-extract.json'), ...profFlag, '--gap', path.join(outDir, 'cv-gap-report.md'), '--out', path.join(outDir, 'cv-tailored.md'), '--report', path.join(outDir, 'cv-tailor-report.md')], { label: 'cv-tailor build' });
     }
     state.steps.cvTailored = { status: inDir('cv-tailored.md') ? 'done' : 'skipped' };

package/bin/profile.mjs

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
-// profile: the one-time consultant profile -> ~/.tor-to-proposal/profile.json
+// profile: the one-time consultant profile -> .tor-to-proposal/profile.json
+// (in the CURRENT folder, so users can see and back it up like any project file;
+//  the legacy ~/.tor-to-proposal/profile.json is still read as a fallback).
 // Every value here is USER-SUPPLIED. The profile is the canonical "user input"
 // trace source downstream tools cite; nothing in it is ever invented or defaulted
 // silently. Plug-and-play: `npx tor-to-proposal init` runs the wizard once, and
@@ -11,9 +13,9 @@ import readline from 'node:readline/promises';
 import { fail, parseArgs, helpText } from './lib.mjs';
 
 const HELP = helpText('profile', [
-  'One-time consultant profile, stored at ~/.tor-to-proposal/profile.json.',
+  'One-time consultant profile, stored at .tor-to-proposal/profile.json in the CURRENT folder.',
   '',
-  '  init                 interactive wizard (terminal prompts; blank = keep current)',
+  '  init                 interactive wizard (terminal prompts; blank = default/keep current)',
   '  set key=value ...    set fields (dotted keys). Values parse as JSON when valid:',
   '                         profile set identity.name="Ayesha Khan" rates.defaults.base=400 cv.masterPath=~/cv/master.md',
   '  get [key]            print the whole profile (or one dotted field) as JSON',
@@ -27,7 +29,12 @@ const HELP = helpText('profile', [
   '  cv.masterPath                                              # your master CV',
 ]);
 
-const FILE = path.join(os.homedir(), '.tor-to-proposal', 'profile.json');
+// Profile lives in the current folder (cwd-first); the legacy home location is
+// only read as a fallback so profiles created by older versions keep working.
+export function profilePath() {
+  return path.resolve('.tor-to-proposal', 'profile.json');
+}
+const LEGACY_FILE = path.join(os.homedir(), '.tor-to-proposal', 'profile.json');
 
 const NUMERIC = {
   'rates.floor.annualIncome': { min: 0, max: 1e9, label: 'annual income need' },
@@ -39,14 +46,18 @@ const NUMERIC = {
 };
 const BASIS = ['hour', 'day', 'week', 'month'];
 
-export function loadProfile() {
+function readProfileAt(file) {
   try {
-    return JSON.parse(fs.readFileSync(FILE, 'utf8'));
+    return JSON.parse(fs.readFileSync(file, 'utf8'));
   } catch {
     return null;
   }
 }
 
+export function loadProfile() {
+  return readProfileAt(profilePath()) || readProfileAt(LEGACY_FILE);
+}
+
 function emptyProfile() {
   const now = new Date().toISOString();
   return {
@@ -100,56 +111,119 @@ function coerceAndValidate(dotted, raw) {
 
 function save(profile) {
   profile.meta = { ...(profile.meta || {}), updatedAt: new Date().toISOString() };
-  fs.mkdirSync(path.dirname(FILE), { recursive: true });
-  fs.writeFileSync(FILE, JSON.stringify(profile, null, 2));
-  process.stderr.write(`written: ${FILE}\n`);
+  const file = profilePath();
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  fs.writeFileSync(file, JSON.stringify(profile, null, 2));
+  process.stderr.write(`written: ${file}\n`);
 }
 
 // ---------- interactive wizard ----------
 async function wizard() {
   const current = loadProfile() || emptyProfile();
+
+  // Answers come from a real terminal when interactive; when stdin is piped
+  // (automation, tests), all lines are read up front and consumed in order.
+  const piped = !process.stdin.isTTY;
+  let pipedLines = [];
+  if (piped) {
+    try {
+      pipedLines = fs.readFileSync(0, 'utf8').split('\n').map((l) => l.trim());
+    } catch { /* empty stdin -> quit below */ }
+  }
+  let pipedPos = 0;
+  const nextLine = async () => (piped ? (pipedPos < pipedLines.length ? pipedLines[pipedPos++] : 'EOF') : '');
+
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const ask = async (label, existing, hint = '') => {
-    const tail = hint ? ` (${hint})` : '';
-    const cur = existing === null || existing === undefined || (Array.isArray(existing) && !existing.length) ? '' : String(Array.isArray(existing) ? existing.join(', ') : existing);
-    const a = (await rl.question(`${label}${tail} [${cur}]: `)).trim();
-    return a === '' ? existing : a;
-  };
+
+  // Each question: [get set on the profile, label, hint, default, toValue]
   const id = current.identity;
-  id.name = await ask('Full name (exactly as on your CV)', id.name);
-  id.credentials = await ask('Credentials after your name (e.g. "PhD, PMP")', id.credentials);
-  id.title = await ask('Professional title (e.g. "M&E Consultant")', id.title);
-  id.email = await ask('Email', id.email);
-  id.phone = await ask('Phone (international format)', id.phone);
-  id.location = await ask('City, country', id.location);
-  id.nationality = await ask('Nationality (some ToRs require it)', id.nationality);
-  id.languages = await ask('Working languages (comma-separated)', id.languages);
-  const cv = await ask('Path to your master CV file', current.cv.masterPath);
-  if (cv !== current.cv.masterPath) {
-    const p = String(cv).replace(/^~(?=\/|$)/, os.homedir());
-    if (!fs.existsSync(p)) process.stderr.write(`  ! file not found (${p}) — stored anyway; fix with: profile set cv.masterPath=...\n`);
-    current.cv.masterPath = p;
-  }
   const fl = current.rates.floor;
-  const asNum = (v) => (v === null || v === undefined || v === '' ? null : Number(v));
-  let a = await ask('Minimum annual income you need (your floor math)', fl.annualIncome, 'e.g. 60000');
-  fl.annualIncome = a === fl.annualIncome ? fl.annualIncome : asNum(a);
-  a = await ask('Realistic billable days per year', fl.billableDays, 'e.g. 180');
-  fl.billableDays = a === fl.billableDays ? fl.billableDays : asNum(a);
-  a = await ask('Cost loading (overheads on top of your net)', fl.costLoading, 'e.g. 0.25');
-  fl.costLoading = a === fl.costLoading ? fl.costLoading : asNum(a);
   const d = current.rates.defaults;
-  a = await ask('Default currency', d.currency || 'USD');
-  d.currency = String(a).toUpperCase();
-  a = await ask('Typical base rate (optional — you confirm it per bid)', d.base, 'e.g. 400');
-  d.base = a === d.base ? d.base : asNum(a);
-  a = await ask('Typical loading', d.loading, 'e.g. 0.25');
-  d.loading = a === d.loading ? d.loading : asNum(a);
+  const expandTilde = (v) => String(v).replace(/^~(?=\/|$)/, os.homedir());
+  const toNum = (v) => (v === null || v === undefined || v === '' ? null : Number(v));
+  const questions = [
+    { label: 'Full name (exactly as on your CV)', get: () => id.name, set: (v) => { id.name = v; } },
+    { label: 'Credentials after your name (e.g. "PhD, PMP")', get: () => id.credentials, set: (v) => { id.credentials = v; } },
+    { label: 'Professional title (e.g. "M&E Consultant")', get: () => id.title, set: (v) => { id.title = v; } },
+    { label: 'Email', get: () => id.email, set: (v) => { id.email = v; } },
+    { label: 'Phone (international format)', get: () => id.phone, set: (v) => { id.phone = v; } },
+    { label: 'City, country', get: () => id.location, set: (v) => { id.location = v; } },
+    { label: 'Nationality (some ToRs require it)', get: () => id.nationality, set: (v) => { id.nationality = v; } },
+    { label: 'Working languages (comma-separated)', get: () => id.languages, set: (v) => { id.languages = v; } },
+    {
+      label: 'Path to your master CV file', get: () => current.cv.masterPath,
+      set: (v) => {
+        if (v === null || v === undefined || v === '') { current.cv.masterPath = current.cv.masterPath ?? null; return; }
+        const p = expandTilde(v);
+        if (!fs.existsSync(p)) process.stderr.write(`  ! file not found (${p}) — stored anyway; fix with: profile set cv.masterPath=...\n`);
+        current.cv.masterPath = p;
+      },
+    },
+    { label: 'Minimum annual income you need (your floor math)', hint: 'e.g. 60000', get: () => fl.annualIncome, set: (v) => { fl.annualIncome = toNum(v); } },
+    { label: 'Realistic billable days per year', hint: 'e.g. 180', get: () => fl.billableDays, set: (v) => { fl.billableDays = toNum(v); } },
+    { label: 'Cost loading (overheads on top of your net)', hint: 'e.g. 0.25', get: () => fl.costLoading, set: (v) => { fl.costLoading = toNum(v); } },
+    { label: 'Default currency', get: () => d.currency || 'USD', set: (v) => { d.currency = String(v).toUpperCase(); } },
+    { label: 'Typical base rate (optional — you confirm it per bid)', hint: 'e.g. 400', get: () => d.base, set: (v) => { d.base = toNum(v); } },
+    { label: 'Typical loading', hint: 'e.g. 0.25', get: () => d.loading, set: (v) => { d.loading = toNum(v); } },
+  ];
+
+  process.stdout.write(
+    `Consultant profile wizard — ${questions.length} questions, one at a time.\n` +
+    'Press Enter to accept the [suggested] value. Type "back" to redo the previous question, "quit" to cancel.\n\n'
+  );
+
+  const fmt = (v) => (v === null || v === undefined || (Array.isArray(v) && !v.length)) ? '' : String(Array.isArray(v) ? v.join(', ') : v);
+  const askLine = async (prompt) => {
+    if (piped) return nextLine();
+    try {
+      return (await rl.question(prompt)).trim();
+    } catch (err) {
+      if (err && (err.code === 'ABORT_ERR' || err.name === 'AbortError')) return 'EOF'; // Ctrl+D
+      throw err;
+    }
+  };
+  let i = 0;
+  while (i < questions.length) {
+    const q = questions[i];
+    const cur = fmt(q.get());
+    const tail = q.hint ? ` (${q.hint})` : '';
+    const a = await askLine(`(${i + 1}/${questions.length}) ${q.label}${tail} [${cur}]: `);
+    if (a === 'EOF' || a.toLowerCase() === 'quit') {
+      rl.close();
+      process.stdout.write('\nCancelled — nothing was saved.\n');
+      return;
+    }
+    if (a.toLowerCase() === 'back') {
+      if (i === 0) { process.stdout.write('  (already at the first question)\n'); continue; }
+      i -= 1;
+      continue;
+    }
+    // blank = keep the current/suggested value shown in brackets
+    q.set(a === '' ? q.get() : a);
+    i += 1;
+  }
+
+  // Summary + confirm before anything is written
+  const fields = [
+    ['name', id.name], ['credentials', id.credentials], ['title', id.title], ['email', id.email],
+    ['phone', id.phone], ['location', id.location], ['nationality', id.nationality], ['languages', id.languages],
+    ['master CV', current.cv.masterPath],
+    ['min annual income', fl.annualIncome], ['billable days/year', fl.billableDays], ['cost loading', fl.costLoading],
+    ['currency', d.currency], ['typical base rate', d.base], ['typical loading', d.loading],
+  ];
+  process.stdout.write('\n--- Your answers ---\n');
+  for (const [k, v] of fields) process.stdout.write(`  ${k.padEnd(20)} ${fmt(v) || '(empty)'}\n`);
+  const confirm = await askLine('\nSave this profile? (Y/n): ');
   rl.close();
+  if (confirm === 'EOF' || confirm === 'n' || confirm === 'no') {
+    process.stdout.write('Cancelled — nothing was saved.\n');
+    return;
+  }
   save(current);
   process.stdout.write(
-    `\nProfile saved: ${FILE}\n\nNext: drop a ToR + your CV into a folder and tell your AI assistant:\n  "Run a bid pack on <folder>"\n` +
-      'Your saved numbers will be offered for one-keystroke confirmation — never used without it.\n'
+    `\nProfile saved: ${profilePath()}\n(it lives in the CURRENT folder — open it with: open .tor-to-proposal)\n\n` +
+    'Next: drop a ToR + your CV into a folder and tell your AI assistant:\n  "Run a bid pack on <folder>"\n' +
+    'Your saved numbers will be offered for one-keystroke confirmation — never used without it.\n'
   );
 }
 
@@ -182,17 +256,20 @@ if (cmd === 'init') {
   save(profile);
 } else if (cmd === 'get') {
   const profile = loadProfile();
-  if (!profile) fail(`no profile at ${FILE} — run: tor-to-proposal init`, 2);
+  if (!profile) fail(`no profile at ${profilePath()} — run: tor-to-proposal init`, 2);
   if (args._[1]) {
     const v = getDeep(profile, args._[1]);
     if (v === undefined) fail(`unknown key: ${args._[1]}`, 2);
     process.stdout.write(JSON.stringify(v, null, 2) + '\n');
   } else process.stdout.write(JSON.stringify(profile, null, 2) + '\n');
 } else if (cmd === 'path') {
-  process.stdout.write(FILE + '\n');
+  process.stdout.write(profilePath() + '\n');
 } else if (cmd === 'erase') {
-  if (fs.existsSync(FILE)) { fs.rmSync(FILE); process.stderr.write(`erased: ${FILE}\n`); }
-  else process.stderr.write('no profile to erase\n');
+  let erased = false;
+  for (const file of [profilePath(), LEGACY_FILE]) {
+    if (fs.existsSync(file)) { fs.rmSync(file); process.stderr.write(`erased: ${file}\n`); erased = true; }
+  }
+  if (!erased) process.stderr.write('no profile to erase\n');
 } else {
   fail(`unknown command: ${cmd} (init | set | get | path | erase)`, 2);
 }

package/bin/tor-to-proposal.mjs

@@ -40,7 +40,7 @@ const DESCRIPTIONS = {
   render: 'fallback markdown -> PDF emitter (no document tooling needed)',
   package: 'verify final docs (re-extract + re-audit) -> pack/ + checklist + zip',
   'bid-pack': 'one-shot orchestrator: start | apply | pack + the consolidated questionnaire',
-  profile: 'consultant profile wizard (~/.tor-to-proposal/profile.json)',
+  profile: 'consultant profile wizard (.tor-to-proposal/profile.json in the current folder)',
   init: 'alias for profile — one-time setup wizard',
 };
 
@@ -59,5 +59,9 @@ if (!TOOLS[cmd]) {
   process.exit(1);
 }
 const script = path.join(path.dirname(fileURLToPath(import.meta.url)), TOOLS[cmd]);
-const res = spawnSync(process.execPath, [script, ...rest], { stdio: 'inherit' });
+// `init` is an alias for `profile init` — without the subcommand profile.mjs
+// would only print its help (this is why plain `tor-to-proposal init` never
+// started the wizard before).
+const sub = cmd === 'init' ? ['init', ...rest] : rest;
+const res = spawnSync(process.execPath, [script, ...sub], { stdio: 'inherit' });
 process.exit(res.status ?? 1);

package/docs/TECHNICAL-GUIDE.md

@@ -57,7 +57,7 @@ formula overwrite) · **3** dependencies missing.
 | `bid-pack start` | `--tor file [--cv file] [--dir bid/] [--no-cv-tailor]` | runs pdf-extract → extract → cv-gap → cv-tailor; `out/questions.{json,md}` (consolidated questionnaire), `out/bid-state.json`, `out/bid-context.json` |
 | `bid-pack apply` | `--answers answers.json [--dir bid/]` | records answers; runs pricing + financial proposal on user numbers; `out/cv-evidence.json`, `out/fill-answers.json`, `out/clarifications.md`; regenerates questions |
 | `bid-pack pack` | `--dir bid/ [--fallback-pdf] [--no-zip]` | delegates to `package` |
-| `profile` (`init`) | `init \| set k=v… \| get [k] \| path \| erase` | `~/.tor-to-proposal/profile.json` — user-supplied identity, floor math, rate defaults, master-CV path |
+| `profile` (`init`) | `init \| set k=v… \| get [k] \| path \| erase` | `.tor-to-proposal/profile.json` in the current folder (legacy `~/.tor-to-proposal/profile.json` read as fallback) — user-supplied identity, floor math, rate defaults, master-CV path |
 | `cv-tailor build` | `--cv master.txt --extract tor-extract.json [--profile p.json] [--gap r.md]` | `cv-tailored.md` (reordered master-CV material only) + `cv-tailor-report.md` (trace + terminology mirror) |
 | `cv-tailor lint` | `--cv tailored.md --master master.txt [--gap] [--evidence cv-evidence.json]` | anchor table; exit 1 on unanchored bullets, altered numbers, GAP terms |
 | `financial-proposal` | `--pricing pricing.json --extract tor-extract.json [--context bid-context.json] [--xlsx]` | `financial-proposal.md` (+ `.xlsx` with visible formulas: `D8=B8*C8`, `D10=SUM`) |
@@ -111,7 +111,7 @@ tor-extract criteria exactly.
 
 **v2 bid-pack contracts** (all under `<bid-dir>/out/`):
 
-- **`~/.tor-to-proposal/profile.json`** — `{identity{name,credentials,…},
+- **`.tor-to-proposal/profile.json` (in the current folder)** — `{identity{name,credentials,…},
   rates{floor{annualIncome,billableDays,costLoading},
   defaults{base,basis,currency,loading,contingency}}, cv{masterPath}}`.
   Every value user-supplied (`profile set` validates numbers/ranges and the

package/mcp/server.mjs

@@ -183,7 +183,7 @@ const TOOLS = [
   {
     name: 'profile_set',
     description:
-      'One-time consultant profile (stored at ~/.tor-to-proposal/profile.json). Set dotted fields: identity.name, identity.credentials, identity.email, identity.phone, identity.title, identity.location, identity.nationality, identity.languages (comma string), rates.floor.annualIncome, rates.floor.billableDays, rates.floor.costLoading, rates.defaults.base/basis/loading/contingency/currency, cv.masterPath. Every value is USER-SUPPLIED — never guess one.',
+      'One-time consultant profile (stored at .tor-to-proposal/profile.json in the current working folder; legacy ~/.tor-to-proposal/profile.json is read as fallback). Set dotted fields: identity.name, identity.credentials, identity.email, identity.phone, identity.title, identity.location, identity.nationality, identity.languages (comma string), rates.floor.annualIncome, rates.floor.billableDays, rates.floor.costLoading, rates.defaults.base/basis/loading/contingency/currency, cv.masterPath. Every value is USER-SUPPLIED — never guess one.',
     inputSchema: S({
       pairs: { type: 'array', items: { type: 'string' }, description: 'key=value pairs, e.g. "identity.name=Ayesha Khan", "rates.defaults.base=400"' },
     }, ['pairs']),
@@ -322,7 +322,7 @@ function handle(msg) {
     return {
       protocolVersion: typeof params?.protocolVersion === 'string' ? params.protocolVersion : '2024-11-05',
       capabilities: { tools: {} },
-      serverInfo: { name: 'tor-to-proposal', version: '2.0.0' },
+      serverInfo: { name: 'tor-to-proposal', version: '2.0.1' },
     };
   }
   if (typeof method === 'string' && method.startsWith('notifications/')) return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tor-to-proposal",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "The bid tool that refuses to lie. ToR + CV in -> verified bid pack out: cover letter, tailored CV, technical response, financial proposal, submission checklist. Deterministic CLI + agent skill for UN / NGO / government consultants.",
   "type": "module",
   "bin": {