tor-to-proposal 2.1.0 → 2.1.4

package/bin/bid-pack.mjs

@@ -139,6 +139,29 @@ function buildQuestions() {
   return { generatedAt: new Date().toISOString(), dir: dir, openCount: items.length, items };
 }
 
+// Per-question "how to answer" hint, shown in the wizard prompt and the
+// questions table so users know the accepted format before replying.
+function answerFormat(item) {
+  switch (item.id) {
+    case 'Q-PRICING-CONFIRM': return 'type yes to use the saved rates — or new numbers like: base 420 loading 0.25 contingency 0.1';
+    case 'Q-PRICING-BASE': return 'a number, e.g. 400';
+    case 'Q-PRICING-LOADING': return 'a decimal, e.g. 0.25 (= 25%)';
+    case 'Q-PRICING-CONTINGENCY': return 'a decimal, e.g. 0.10 (= 10%)';
+    case 'Q-PRICING-CURRENCY': return 'a currency code, e.g. USD';
+    case 'Q-EFFORT-DAYS': return 'a number of person-days, e.g. 25';
+    case 'Q-AVAILABILITY': return 'a date, e.g. 1 November 2026';
+    case 'Q-VALIDITY': return 'a phrase, e.g. 90 days from submission';
+    case 'Q-FILL-CONSULTANT': return 'the consultant name as it should appear in the document';
+    case 'Q-FILL-REIMBURSABLES': return 'a sentence about which costs are reimbursable';
+    case 'Q-FILL-TAXES': return 'a sentence about your tax status';
+  }
+  if (item.id.startsWith('Q-CVE-')) return 'the exact true wording that supports the line — or DELETE to remove the line';
+  if (item.type === 'number') return `a number${item.unit ? ` in ${item.unit}` : ''}`;
+  if (item.type === 'date') return 'a date, e.g. 1 November 2026';
+  if (item.type === 'confirm') return 'yes or no';
+  return 'a short sentence';
+}
+
 function writeQuestions(q) {
   fs.writeFileSync(path.join(outDir, 'questions.json'), JSON.stringify(q, null, 2));
   const yours = q.items.filter((i) => i.type !== 'client');
@@ -147,7 +170,7 @@ function writeQuestions(q) {
   const intro = `Reply with the numbered answers; your assistant writes them to answers.json and runs:\n\n    tor-to-proposal bid-pack apply --answers answers.json --dir ${dir}\n`;
   const md =
     `# Bid questions — answer these in one go\n\n` +
-    (yours.length ? intro + '\n' + mdTable(['#', 'Question', 'Why it is asked'], yours.map((i) => [++n, `**${i.id}** — ${i.question}${i.default !== undefined && i.default !== null ? ` (default: ${i.default})` : ''}`, i.why || ''])) + '\n' : 'None — everything mechanical is resolved.\n') +
+    (yours.length ? intro + '\n' + mdTable(['#', 'Question', 'How to answer', 'Why it is asked'], yours.map((i) => [++n, `**${i.id}** — ${i.question}${i.default !== undefined && i.default !== null ? ` (default: ${i.default})` : ''}`, answerFormat(i), i.why || ''])) + '\n' : 'None — everything mechanical is resolved.\n') +
     (clients.length ? `\n## To send to the CLIENT (clarifications, before the cutoff)\n${clients.map((i) => `- ${i.question}`).join('\n')}\n` : '');
   writeOut(path.join(outDir, 'questions.md'), md);
 }
@@ -327,11 +350,17 @@ function apply() {
     if (pricing.loading !== null && pricing.loading !== undefined) argv.push('--loading', String(pricing.loading));
     if (pricing.contingency !== null && pricing.contingency !== undefined) argv.push('--contingency', String(pricing.contingency));
     const extractPath = inDir('tor-extract.json');
-    const effort = pricing.effort ?? (extractPath && JSON.parse(fs.readFileSync(extractPath, 'utf8')).effortPersonDays?.value);
+    // users answer effort in natural language ("25", "25 person-days", "about 25 days") —
+    // pricing-model needs a bare number, so coerce here instead of failing pricing
+    const effortRaw = pricing.effort ?? (extractPath && JSON.parse(fs.readFileSync(extractPath, 'utf8')).effortPersonDays?.value);
+    const effortMatch = effortRaw === null || effortRaw === undefined ? null : String(effortRaw).replace(/,/g, '').match(/-?\d+(\.\d+)?/);
+    const effort = effortMatch ? Number(effortMatch[0]) : null;
     if (effort !== null && effort !== undefined) argv.push('--effort', String(effort));
     const r = run('pricing-model.mjs', argv, { label: 'pricing-model' });
     pricingRan = r !== null;
     process.stderr.write(r === null ? 'pricing NOT written — check the values; the pricing question stays open.\n' : `pricing written from user-confirmed numbers -> ${outDir}/pricing.json\n`);
+  } else if (answers['Q-PRICING-CONFIRM'] !== undefined) {
+    process.stderr.write('Q-PRICING-CONFIRM: no usable pricing in that answer — reply "yes" to use your saved rates, or new numbers like "base 420 loading 0.25". The pricing question stays open.\n');
   }
 
   // side effect: (re)render the financial proposal when its inputs are ready
@@ -351,6 +380,8 @@ function apply() {
   fresh.items = fresh.items.filter((i) => i.answer === null);
   fresh.openCount = fresh.items.length;
   writeQuestions(fresh);
+  const stillYours = fresh.items.filter((i) => i.type !== 'client');
+  const stillClient = fresh.items.filter((i) => i.type === 'client');
   const state = readState();
   state.steps.questions = { status: 'done', open: fresh.openCount };
   state.steps.pricing = { status: inDir('pricing.json') ? 'done' : 'awaiting-user-numbers' };
@@ -359,7 +390,13 @@ function apply() {
 
   process.stdout.write(
     `# Apply: ${applied} answer(s) recorded, ${fresh.openCount} still open\n\n` +
-      (fresh.openCount ? mdTable(['#', 'Still open'], fresh.items.map((i, ix) => [ix + 1, `**${i.id}** — ${i.question}`])) + '\n' : 'All questions resolved. Draft/generate, then: bid-pack pack --dir ' + dir + '\n') +
+      (stillYours.length
+        ? `## Still open — answer these (bid-pack ask)\n${mdTable(['#', 'Question'], stillYours.map((i, ix) => [ix + 1, `**${i.id}** — ${i.question}`]))}\n`
+        : '') +
+      (stillClient.length
+        ? `## Reminders — ACTIONS for you, not answers\n(These describe things to DO outside the tool: contact the client, verify a fact. They never close by typing an answer here.)\n${mdTable(['#', 'Action'], stillClient.map((i, ix) => [ix + 1, `**${i.id}** — ${i.question}`]))}\n`
+        : '') +
+      (!fresh.openCount ? `All questions resolved. Draft/generate, then: bid-pack pack --dir ${dir}\n` : '') +
       (fills.length ? `\nFill answers recorded in out/fill-answers.json — apply them to the drafts, re-run the lints, and the questions disappear once the [FILL]s are gone.\n` : '') +
       (evidence.length ? `\nCV evidence entries: ${evidence.length} (out/cv-evidence.json) — cv-tailor lint accepts these as user-input anchors.\n` : '')
   );
@@ -410,12 +447,16 @@ async function askWizard() {
   );
 
   const answers = {};
+  // a pricing answer is only usable if it is "yes" or contains a base number —
+  // anything else would silently skip pricing and re-open the question later,
+  // so the wizard rejects it on the spot and re-asks
+  const pricingAnswerUsable = (a) => /^yes$/i.test(a) || /\bbase\b\s*[\d]/i.test(a);
   let i = 0;
   while (i < yours.length) {
     const item = yours[i];
     const cur = item.default !== undefined && item.default !== null ? String(item.default) : '';
     const tail = item.unit ? ` (${item.unit})` : '';
-    const a = await askLine(`(${i + 1}/${yours.length}) ${item.question}${tail}${cur ? ` [${cur}]` : ''}\n> `);
+    const a = await askLine(`(${i + 1}/${yours.length}) ${item.question}${tail}${cur ? ` [${cur}]` : ''}\n  How to answer: ${answerFormat(item)}\n> `);
     if (a === 'EOF' || a.toLowerCase() === 'quit') {
       rl.close();
       process.stdout.write('\nCancelled — nothing was saved. (Your documents are untouched; run bid-pack ask again anytime.)\n');
@@ -432,6 +473,10 @@ async function askWizard() {
       process.stdout.write('  This one needs an answer from you (no suggested default). Type it, or "quit" to stop.\n');
       continue;
     }
+    if (item.id === 'Q-PRICING-CONFIRM' && a !== '' && !pricingAnswerUsable(a)) {
+      process.stdout.write('  I can\'t price from that alone. Either type "yes" to use the saved rates shown above, or give new numbers like: base 420 loading 0.25 contingency 0.1\n');
+      continue;
+    }
     answers[item.id] = a === '' ? item.default : a;
     i += 1;
   }

package/mcp/server.mjs

@@ -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.1.0' },
+      serverInfo: { name: 'tor-to-proposal', version: '2.1.4' },
     };
   }
   if (typeof method === 'string' && method.startsWith('notifications/')) return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tor-to-proposal",
-  "version": "2.1.0",
+  "version": "2.1.4",
   "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": {