sandoichi 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandoichi",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Reduce repeated tool-output context in Claude Code and Codex.",
   "license": "MIT",
   "author": "yuzushi",

package/src/postinstall.mjs

@@ -8,10 +8,10 @@ import readline from 'node:readline/promises';
 import { pathToFileURL } from 'node:url';
 
 import {
-  CONSENT_VERSION, defaultTelemetryConfigPath, enableTelemetry, isDoNotTrack, readTelemetryConfig, TELEMETRY_DETAILS_URL,
+  defaultTelemetryConfigPath, enableTelemetry, isDoNotTrack, readTelemetryConfig, TELEMETRY_DETAILS_URL,
 } from './telemetry.mjs';
 
-const CONSENT_PROMPT = `Enable anonymous telemetry? Full details at: ${TELEMETRY_DETAILS_URL} [y/N] `;
+const CONSENT_PROMPT = `Enable anonymous telemetry? Full details at: ${TELEMETRY_DETAILS_URL} [y/yes/N/no] `;
 
 export async function runPostinstall({
   env = process.env, stdin = process.stdin, stdout = process.stdout,
@@ -24,7 +24,7 @@ export async function runPostinstall({
 
     const configPath = defaultTelemetryConfigPath(env);
     const current = readTelemetryConfig(configPath);
-    if (current.prompted_consent_version >= CONSENT_VERSION) return; // never re-ask on reinstall/upgrade
+    if (current.consent_state !== 'unasked') return; // never re-ask on reinstall/upgrade
 
     const rl = readlineFactory();
     let answer;

package/src/session-start.mjs

@@ -1,7 +1,8 @@
 import path from 'node:path';
 
 import {
-  closeFinishedDays, defaultTelemetryConfigPath, defaultTelemetryStatePaths, isDoNotTrack, readTelemetryConfig, TELEMETRY_DETAILS_URL,
+  closeFinishedDays, defaultTelemetryConfigPath, defaultTelemetryStatePaths, isDoNotTrack, markTelemetryAsked,
+  readTelemetryConfig, TELEMETRY_DETAILS_URL,
 } from './telemetry.mjs';
 import { PLUGIN_VERSION } from './version.mjs';
 
@@ -10,28 +11,35 @@ export function runSessionStart({
   stdout = process.stdout,
   rootEnv = 'PLUGIN_ROOT',
   spawnImpl,
-  configPath = defaultTelemetryConfigPath(env),
-  statePaths = defaultTelemetryStatePaths(env),
+  configPath,
+  statePaths,
 } = {}) {
   try {
-    const config = readTelemetryConfig(configPath);
-    if (config.enabled && !isDoNotTrack(env)) {
+    if (isDoNotTrack(env)) {
+      stdout.write('{}\n');
+      return;
+    }
+    const telemetryConfigPath = configPath ?? defaultTelemetryConfigPath(env);
+    const telemetryStatePaths = statePaths ?? defaultTelemetryStatePaths(env);
+    const config = readTelemetryConfig(telemetryConfigPath);
+    if (config.enabled) {
       closeFinishedDays({
-        statePaths, configPath, day: new Date().toISOString().slice(0, 10),
+        statePaths: telemetryStatePaths, configPath: telemetryConfigPath, day: new Date().toISOString().slice(0, 10),
         pluginVersion: PLUGIN_VERSION, ...(spawnImpl ? { spawnImpl } : {}),
       });
     }
-    if (isDoNotTrack(env) || config.prompted_consent_version > 0) {
+    if (config.consent_state !== 'unasked' || !markTelemetryAsked(telemetryConfigPath)) {
       stdout.write('{}\n');
       return;
     }
     const pluginRoot = env[rootEnv] || path.resolve(import.meta.dirname, '..');
     const cli = path.join(pluginRoot, 'lib', 'telemetry-cli.mjs');
     stdout.write(`${JSON.stringify({
+      systemMessage: 'Sando can send anonymous aggregate telemetry (opt-in, off by default). '
+        + 'Reply with exactly `sando telemetry yes` or `sando telemetry no`, '
+        + `or run \`node "${cli}" enable\`. Details: ${TELEMETRY_DETAILS_URL}`,
       hookSpecificOutput: {
         hookEventName: 'SessionStart',
-        systemMessage: 'Sando can send anonymous aggregate telemetry (opt-in, off by default). '
-          + `Run \`node "${cli}" enable\` to turn it on. Details: ${TELEMETRY_DETAILS_URL}`,
       },
     })}\n`);
   } catch {

package/src/telemetry-cli.mjs

@@ -10,7 +10,7 @@ import {
 } from './telemetry.mjs';
 
 const USAGE = 'Usage: sando telemetry <status|enable|disable [--purge]|preview|flush>\n';
-const CONSENT_PROMPT = `Enable anonymous telemetry? Full details at: ${TELEMETRY_DETAILS_URL} [y/N] `;
+const CONSENT_PROMPT = `Enable anonymous telemetry? Full details at: ${TELEMETRY_DETAILS_URL} [y/yes/N/no] `;
 
 async function defaultPrompt(message) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -47,10 +47,13 @@ export async function runTelemetryCli({
         stdout.write('telemetry already enabled.\n');
         return current;
       }
+      if (current.consent_state === 'declined') {
+        stdout.write('telemetry not enabled.\n');
+        return current;
+      }
       const answer = await prompt(CONSENT_PROMPT);
       const result = enableTelemetry({
-        configPath, interactive: true,
-        answer: /^(y|yes)$/i.test((answer ?? '').trim()) ? 'yes' : answer,
+        configPath, interactive: true, answer,
       });
       stdout.write(result.enabled ? 'telemetry enabled.\n' : 'telemetry not enabled.\n');
       return result;

package/src/telemetry.mjs

@@ -105,6 +105,7 @@ export function serializeEvent(payload) {
 export const TELEMETRY_CONFIG_VERSION = 1;
 export const CONSENT_VERSION = 1;
 export const TELEMETRY_DETAILS_URL = 'https://github.com/yuzushi-dev/Sando/blob/main/TELEMETRY.md';
+export const CONSENT_STATES = ['unasked', 'asked', 'enabled', 'declined'];
 // Canary phase: shared backend, fronted by a Cloudflare Tunnel so it's
 // reachable from any of the owner's machines (see
 // session-handoff/deploy/telemetry/). Rate-limited at nginx (30 req/min/IP).
@@ -119,12 +120,15 @@ export function isDoNotTrack(env = process.env) {
 function record(value) { return value !== null && typeof value === 'object' && !Array.isArray(value); }
 
 function emptyTelemetryConfig() {
-  return { schema_version: TELEMETRY_CONFIG_VERSION, enabled: false, prompted_consent_version: 0 };
+  return {
+    schema_version: TELEMETRY_CONFIG_VERSION, enabled: false, prompted_consent_version: 0, consent_state: 'unasked',
+  };
 }
 
 function validateTelemetryConfig(value) {
   if (!record(value) || value.schema_version !== TELEMETRY_CONFIG_VERSION || typeof value.enabled !== 'boolean'
-    || !Number.isInteger(value.prompted_consent_version) || value.prompted_consent_version < 0) {
+    || !Number.isInteger(value.prompted_consent_version) || value.prompted_consent_version < 0
+    || !CONSENT_STATES.includes(value.consent_state)) {
     throw new Error('telemetry config is invalid');
   }
   if (value.enabled) {
@@ -150,7 +154,14 @@ export function defaultTelemetryStatePaths(env = process.env) {
 
 export function readTelemetryConfig(configPath = defaultTelemetryConfigPath()) {
   if (!fs.existsSync(configPath)) return emptyTelemetryConfig();
-  return validateTelemetryConfig(JSON.parse(fs.readFileSync(configPath, 'utf8')));
+  const value = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  // Legacy files cannot distinguish an explicit no from blank input or the old
+  // y-as-no bug. Keep that ambiguous decision as asked, not as a decline.
+  const migrated = Object.hasOwn(value, 'consent_state') ? value : {
+    ...value,
+    consent_state: value.enabled ? 'enabled' : value.prompted_consent_version > 0 ? 'asked' : 'unasked',
+  };
+  return validateTelemetryConfig(migrated);
 }
 
 function writeTelemetryConfig(configPath, config) {
@@ -164,19 +175,48 @@ export function statusTelemetry(configPath = defaultTelemetryConfigPath()) {
   return readTelemetryConfig(configPath);
 }
 
-/** Only an explicit `yes` in an interactive session enables collection. */
+export function normalizeConsentAnswer(answer) {
+  if (typeof answer !== 'string') return undefined;
+  const normalized = answer.trim().toLowerCase();
+  if (normalized === 'y' || normalized === 'yes') return 'yes';
+  if (normalized === 'n' || normalized === 'no') return 'no';
+  return undefined;
+}
+
+export function markTelemetryAsked(configPath = defaultTelemetryConfigPath()) {
+  ensureDirectory(path.dirname(configPath));
+  return withLock(`${configPath}.lock`, () => {
+    const current = readTelemetryConfig(configPath);
+    if (current.consent_state !== 'unasked') return false;
+    const next = {
+      ...current, enabled: false, prompted_consent_version: CONSENT_VERSION, consent_state: 'asked',
+    };
+    validateTelemetryConfig(next);
+    atomicWrite(configPath, next);
+    return true;
+  });
+}
+
+/** Only an explicit yes enables collection; explicit no declines, other input stays asked/off. */
 export function enableTelemetry({ configPath = defaultTelemetryConfigPath(), answer, interactive = true, now = () => new Date() } = {}) {
   if (!interactive) return { ...readTelemetryConfig(configPath), exitCode: 1 };
-  if (typeof answer !== 'string' || answer.trim().toLowerCase() !== 'yes') {
-    return writeTelemetryConfig(configPath, { schema_version: TELEMETRY_CONFIG_VERSION, enabled: false, prompted_consent_version: CONSENT_VERSION });
+  const normalized = normalizeConsentAnswer(answer);
+  if (normalized === 'yes') {
+    return writeTelemetryConfig(configPath, {
+      schema_version: TELEMETRY_CONFIG_VERSION,
+      enabled: true,
+      prompted_consent_version: CONSENT_VERSION,
+      consent_state: 'enabled',
+      consent_version: CONSENT_VERSION,
+      consented_at: now().toISOString(),
+      endpoint: TELEMETRY_ENDPOINT,
+    });
   }
   return writeTelemetryConfig(configPath, {
     schema_version: TELEMETRY_CONFIG_VERSION,
-    enabled: true,
+    enabled: false,
     prompted_consent_version: CONSENT_VERSION,
-    consent_version: CONSENT_VERSION,
-    consented_at: now().toISOString(),
-    endpoint: TELEMETRY_ENDPOINT,
+    consent_state: normalized === 'no' ? 'declined' : 'asked',
   });
 }
 
@@ -509,6 +549,7 @@ export function disableTelemetry({ configPath = defaultTelemetryConfigPath(), pu
     schema_version: TELEMETRY_CONFIG_VERSION,
     enabled: false,
     prompted_consent_version: previous.prompted_consent_version || CONSENT_VERSION,
+    consent_state: 'declined',
   });
   if (purge) {
     for (const target of [statePaths.counters, statePaths.queue]) fs.rmSync(target, { force: true });

package/src/user-prompt-submit.mjs

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+import {
+  defaultTelemetryConfigPath, enableTelemetry, isDoNotTrack, readTelemetryConfig,
+} from './telemetry.mjs';
+
+const CONSENT_COMMANDS = new Map([
+  ['sando telemetry yes', 'yes'],
+  ['sando telemetry no', 'no'],
+]);
+
+function pass(stdout) { stdout.write('{}\n'); }
+
+export function runUserPromptSubmit({
+  env = process.env, input, stdout = process.stdout, configPath,
+} = {}) {
+  try {
+    if (isDoNotTrack(env)) {
+      pass(stdout);
+      return;
+    }
+    const telemetryConfigPath = configPath ?? defaultTelemetryConfigPath(env);
+    const rawInput = input === undefined ? fs.readFileSync(0, 'utf8') : input;
+    const prompt = JSON.parse(rawInput || '{}').prompt;
+    // Normalizza solo gli spazi ai bordi: non introduce ambiguita' (la stringa
+    // resta esatta) ed evita di perdere risposte genuine incollate con spazi.
+    const answer = typeof prompt === 'string' ? CONSENT_COMMANDS.get(prompt.trim()) : undefined;
+    if (!answer) {
+      pass(stdout);
+      return;
+    }
+    const current = readTelemetryConfig(telemetryConfigPath);
+    if (current.consent_state === 'declined' && answer === 'yes') {
+      pass(stdout);
+      return;
+    }
+    const result = enableTelemetry({ configPath: telemetryConfigPath, interactive: true, answer });
+    stdout.write(`${JSON.stringify({
+      systemMessage: result.enabled ? 'Sando telemetry enabled.' : 'Sando telemetry disabled.',
+    })}\n`);
+  } catch {
+    pass(stdout);
+  }
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(path.resolve(process.argv[1])).href) {
+  runUserPromptSubmit();
+}

package/src/version.mjs

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 
 const VERSION_PATTERN = /^\d+\.\d+(?:\.\d+)?$/;
-const STANDALONE_VERSION = '0.2.0';
+const STANDALONE_VERSION = '0.3.0';
 const METADATA_FILES = ['package.json', '.claude-plugin/plugin.json', '.codex-plugin/plugin.json'];
 
 function findMetadataFile() {