codeply-cli 0.5.0 → 0.5.2

package/lib/commands.js

@@ -1,103 +1,103 @@
-/**
- * Custom slash commands: a markdown file per command, same layout opencode
- * and Claude Code use, so existing ones can be copied over.
- *
- *   ~/.codeply/commands/<name>.md          (every project)
- *   <project>/.codeply/commands/<name>.md  (this project; same name wins)
- *
- *   ---
- *   description: Review the changed files for bugs
- *   mode: Plan            # optional: Build | Plan | Ask
- *   ---
- *   Review $ARGUMENTS for correctness bugs. Cite file:line.
- *
- * In the body, $ARGUMENTS is everything typed after the command, $1 $2 ...
- * are single words (the highest one takes the rest), and if the body has no
- * placeholder at all the arguments are appended on their own line.
- * Sub-folders become part of the name: commands/git/pr.md is /git/pr.
- * Installed plugins add theirs as /<plugin>:<name> (see plugins.js).
- */
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const plugins = require('./plugins.js');
-
-const MAX_BODY = 20000;
-const RESERVED = new Set(['goal', 'g', 'skills', 'skill', 'skill-list']);
-
-function parseFrontmatter(text) {
-  const m = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/.exec(text);
-  if (!m) return { meta: {}, body: text };
-  const meta = {};
-  for (const line of m[1].split(/\r?\n/)) {
-    const kv = /^([A-Za-z_-]+)\s*:\s*(.*)$/.exec(line);
-    if (kv) meta[kv[1].toLowerCase()] = kv[2].trim().replace(/^["']|["']$/g, '');
-  }
-  return { meta, body: text.slice(m[0].length) };
-}
-
-function scan(dir, prefix, out) {
-  let entries;
-  try { entries = fs.readdirSync(dir, { withFileTypes: true }); } catch { return; }
-  for (const e of entries) {
-    const full = path.join(dir, e.name);
-    if (e.isDirectory()) scan(full, `${prefix}${e.name}/`, out);
-    else if (e.isFile() && e.name.toLowerCase().endsWith('.md')) {
-      const name = `${prefix}${e.name.slice(0, -3)}`.toLowerCase().replace(/\s+/g, '-');
-      if (RESERVED.has(name)) continue;
-      try {
-        const { meta, body } = parseFrontmatter(fs.readFileSync(full, 'utf8').slice(0, MAX_BODY));
-        const mode = ['Build', 'Plan', 'Ask'].find((x) => x.toLowerCase() === String(meta.mode || '').toLowerCase());
-        out.set(name, {
-          name,
-          description: meta.description || body.trim().split('\n')[0].slice(0, 100),
-          mode: mode || null,
-          body: body.trim(),
-          file: full,
-        });
-      } catch {}
-    }
-  }
-}
-
-/** @returns {Map<string, {name, description, mode, body, file}>} */
-function loadCommands(cwd) {
-  const out = new Map();
-  for (const { plugin, dir } of plugins.commandDirs(cwd)) scan(dir, `${plugin}:`, out);
-  scan(path.join(os.homedir(), '.codeply', 'commands'), '', out);
-  if (cwd) scan(path.join(cwd, '.codeply', 'commands'), '', out);
-  return out;
-}
-
-/** Fill a command's template with what was typed after it. */
-function expand(cmd, argText) {
-  const args = String(argText || '').trim();
-  const words = args ? args.split(/\s+/) : [];
-  let body = cmd.body;
-  const nums = [...body.matchAll(/\$(\d+)/g)].map((m) => Number(m[1]));
-  const max = nums.length ? Math.max(...nums) : 0;
-  const used = /\$ARGUMENTS|\$\d+/.test(body);
-  body = body.replace(/\$(\d+)/g, (_, n) => {
-    const i = Number(n) - 1;
-    return Number(n) === max ? words.slice(i).join(' ') : (words[i] || '');
-  });
-  body = body.replace(/\$ARGUMENTS/g, args);
-  if (!used && args) body = `${body}\n\n${args}`;
-  return body.trim();
-}
-
-/**
- * If `text` starts with a known custom command, the expanded prompt and the
- * command; otherwise null. `/goal` and the app's built-ins are never matched.
- */
-function resolve(text, cwd) {
-  const m = /^\/([A-Za-z0-9_./:-]+)(?:\s+([\s\S]*))?$/.exec(String(text || '').trim());
-  if (!m) return null;
-  const name = m[1].toLowerCase();
-  if (RESERVED.has(name)) return null;
-  const cmd = loadCommands(cwd).get(name);
-  if (!cmd) return null;
-  return { command: cmd, prompt: expand(cmd, m[2] || '') };
-}
-
-module.exports = { loadCommands, expand, resolve, parseFrontmatter };
+/**
+ * Custom slash commands: a markdown file per command, same layout opencode
+ * and Claude Code use, so existing ones can be copied over.
+ *
+ *   ~/.codeply/commands/<name>.md          (every project)
+ *   <project>/.codeply/commands/<name>.md  (this project; same name wins)
+ *
+ *   ---
+ *   description: Review the changed files for bugs
+ *   mode: Plan            # optional: Build | Plan | Ask
+ *   ---
+ *   Review $ARGUMENTS for correctness bugs. Cite file:line.
+ *
+ * In the body, $ARGUMENTS is everything typed after the command, $1 $2 ...
+ * are single words (the highest one takes the rest), and if the body has no
+ * placeholder at all the arguments are appended on their own line.
+ * Sub-folders become part of the name: commands/git/pr.md is /git/pr.
+ * Installed plugins add theirs as /<plugin>:<name> (see plugins.js).
+ */
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const plugins = require('./plugins.js');
+
+const MAX_BODY = 20000;
+const RESERVED = new Set(['goal', 'g', 'skills', 'skill', 'skill-list']);
+
+function parseFrontmatter(text) {
+  const m = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/.exec(text);
+  if (!m) return { meta: {}, body: text };
+  const meta = {};
+  for (const line of m[1].split(/\r?\n/)) {
+    const kv = /^([A-Za-z_-]+)\s*:\s*(.*)$/.exec(line);
+    if (kv) meta[kv[1].toLowerCase()] = kv[2].trim().replace(/^["']|["']$/g, '');
+  }
+  return { meta, body: text.slice(m[0].length) };
+}
+
+function scan(dir, prefix, out) {
+  let entries;
+  try { entries = fs.readdirSync(dir, { withFileTypes: true }); } catch { return; }
+  for (const e of entries) {
+    const full = path.join(dir, e.name);
+    if (e.isDirectory()) scan(full, `${prefix}${e.name}/`, out);
+    else if (e.isFile() && e.name.toLowerCase().endsWith('.md')) {
+      const name = `${prefix}${e.name.slice(0, -3)}`.toLowerCase().replace(/\s+/g, '-');
+      if (RESERVED.has(name)) continue;
+      try {
+        const { meta, body } = parseFrontmatter(fs.readFileSync(full, 'utf8').slice(0, MAX_BODY));
+        const mode = ['Build', 'Plan', 'Ask'].find((x) => x.toLowerCase() === String(meta.mode || '').toLowerCase());
+        out.set(name, {
+          name,
+          description: meta.description || body.trim().split('\n')[0].slice(0, 100),
+          mode: mode || null,
+          body: body.trim(),
+          file: full,
+        });
+      } catch {}
+    }
+  }
+}
+
+/** @returns {Map<string, {name, description, mode, body, file}>} */
+function loadCommands(cwd) {
+  const out = new Map();
+  for (const { plugin, dir } of plugins.commandDirs(cwd)) scan(dir, `${plugin}:`, out);
+  scan(path.join(os.homedir(), '.codeply', 'commands'), '', out);
+  if (cwd) scan(path.join(cwd, '.codeply', 'commands'), '', out);
+  return out;
+}
+
+/** Fill a command's template with what was typed after it. */
+function expand(cmd, argText) {
+  const args = String(argText || '').trim();
+  const words = args ? args.split(/\s+/) : [];
+  let body = cmd.body;
+  const nums = [...body.matchAll(/\$(\d+)/g)].map((m) => Number(m[1]));
+  const max = nums.length ? Math.max(...nums) : 0;
+  const used = /\$ARGUMENTS|\$\d+/.test(body);
+  body = body.replace(/\$(\d+)/g, (_, n) => {
+    const i = Number(n) - 1;
+    return Number(n) === max ? words.slice(i).join(' ') : (words[i] || '');
+  });
+  body = body.replace(/\$ARGUMENTS/g, args);
+  if (!used && args) body = `${body}\n\n${args}`;
+  return body.trim();
+}
+
+/**
+ * If `text` starts with a known custom command, the expanded prompt and the
+ * command; otherwise null. `/goal` and the app's built-ins are never matched.
+ */
+function resolve(text, cwd) {
+  const m = /^\/([A-Za-z0-9_./:-]+)(?:\s+([\s\S]*))?$/.exec(String(text || '').trim());
+  if (!m) return null;
+  const name = m[1].toLowerCase();
+  if (RESERVED.has(name)) return null;
+  const cmd = loadCommands(cwd).get(name);
+  if (!cmd) return null;
+  return { command: cmd, prompt: expand(cmd, m[2] || '') };
+}
+
+module.exports = { loadCommands, expand, resolve, parseFrontmatter };

package/lib/config.js

@@ -98,8 +98,19 @@ function getConfig() {
     };
   }
 
+  // Research Mode (local Ollama or Ollama Cloud), see research-mode/.
+  const fr = file.research || {};
+  const research = {
+    enabled: fr.enabled === true,
+    mode: fr.mode === 'cloud' ? 'cloud' : 'local',
+    model: String(fr.model || ''),
+    apiKey: process.env.OLLAMA_API_KEY || fr.apiKey || '',
+    context: String(fr.context || ''),
+  };
+
   return {
     provider,
+    research,
     ollama: {
       host: (process.env.OLLAMA_HOST || fileOllama.host || DEFAULTS.ollama.host).replace(/\/+$/, ''),
       model: process.env.OLLAMA_MODEL || fileOllama.model || DEFAULTS.ollama.model,
@@ -121,7 +132,7 @@ function saveConfig(patch) {
   const current = readFile();
   if (lastReadFailed) return { ok: false, error: `${configPath} is not valid JSON. Fix or delete it, then try again.` };
   const next = { ...current, ...patch };
-  for (const name of ['ollama', ...BYOK_PROVIDERS]) {
+  for (const name of ['ollama', 'research', ...BYOK_PROVIDERS]) {
     if (current[name] || patch[name]) {
       next[name] = { ...(current[name] || {}), ...(patch[name] || {}) };
     }
@@ -209,7 +220,8 @@ function disconnectIntegration(name) {
 // ever sent to the base URL the user typed in, never to Codeply.
 //
 //   selectedModel: 'auto' | <model id>
-//   models: [{ id, name, kind: 'openai' | 'ollama', baseUrl, model, apiKey, createdAt }]
+//   models: [{ id, name, kind: 'openai' | 'ollama', baseUrl, model, apiKey, createdAt,
+//              phone?, phoneSyncedAt?, phoneUser?, phoneError? }]   (phone sync: model-sync.js)
 
 const AUTO_MODEL_ID = 'auto';
 
@@ -326,6 +338,12 @@ function saveModel(input) {
     apiKey: input.apiKey === undefined || input.apiKey === null ? (existing?.apiKey || '') : String(input.apiKey).trim(),
     createdAt: existing?.createdAt || Date.now(),
   };
+  // "Use on my phone" (model-sync.js). phone: true/false once chosen, absent
+  // for models added before the option existed; the sync status fields are
+  // only ever written by setModelPhone.
+  const phone = typeof input.phone === 'boolean' ? input.phone : existing?.phone;
+  if (typeof phone === 'boolean') entry.phone = phone;
+  for (const k of PHONE_FIELDS) if (existing && existing[k] !== undefined) entry[k] = existing[k];
   file.models = existing
     ? file.models.map((m) => (m.id === entry.id ? entry : m))
     : [...file.models, entry];
@@ -333,8 +351,41 @@ function saveModel(input) {
   return w.ok ? { ok: true, model: entry } : w;
 }
 
+const PHONE_FIELDS = ['phoneSyncedAt', 'phoneUser', 'phoneError'];
+
+/** Updates a model's phone sync state: { phone?, phoneSyncedAt?, phoneUser?, phoneError? }. */
+function setModelPhone(id, patch) {
+  const file = readModelsState();
+  const m = file.models.find((x) => x.id === id);
+  if (!m) return { ok: false, error: 'Unknown model.' };
+  for (const k of ['phone', ...PHONE_FIELDS]) if (patch[k] !== undefined) m[k] = patch[k];
+  const w = writeFile(file);
+  return w.ok ? { ok: true, model: m } : w;
+}
+
+/**
+ * Synced models removed here but not yet removed from the account (offline,
+ * signed out). Kept until the delete goes through, so a removed key never
+ * lingers in the cloud: [{ id, user }].
+ */
+function getPhoneDeletes() {
+  const list = readFile().phoneDeletes;
+  return Array.isArray(list) ? list.filter((d) => d && d.id) : [];
+}
+
+function setPhoneDeletes(list) {
+  const file = readModelsState();
+  file.phoneDeletes = list;
+  return writeFile(file);
+}
+
 function deleteModel(id) {
   const file = readModelsState();
+  const gone = file.models.find((m) => m.id === id);
+  if (gone && gone.phoneSyncedAt) {
+    const pending = Array.isArray(file.phoneDeletes) ? file.phoneDeletes : [];
+    if (!pending.some((d) => d.id === id)) file.phoneDeletes = [...pending, { id, user: gone.phoneUser || null }];
+  }
   file.models = file.models.filter((m) => m.id !== id);
   if (file.selectedModel === id) file.selectedModel = AUTO_MODEL_ID;
   return writeFile(file);
@@ -347,6 +398,34 @@ function selectModel(id) {
   return writeFile(file);
 }
 
+/**
+ * The models the signed-in ChatGPT plan offers (see chatgpt.js), kept as
+ * kind "chatgpt" entries so the pickers, routing and the phone all treat them
+ * like any other model. No key is stored: chatgpt.js holds the tokens.
+ * Passing [] removes them all (sign-out); the selection falls back to Auto if
+ * the chosen one went away.
+ */
+function syncChatGPTModels(list) {
+  const file = readModelsState();
+  const existing = file.models.filter((m) => m.kind === 'chatgpt');
+  const next = (list || []).map((x) => {
+    const prev = existing.find((m) => m.model === x.slug);
+    return {
+      id: prev ? prev.id : newModelId(),
+      name: x.name || x.slug,
+      kind: 'chatgpt',
+      baseUrl: 'https://api.openai.com/v1',
+      model: x.slug,
+      apiKey: '',
+      createdAt: prev?.createdAt || Date.now(),
+    };
+  });
+  file.models = [...file.models.filter((m) => m.kind !== 'chatgpt'), ...next];
+  if (file.selectedModel !== AUTO_MODEL_ID && !file.models.some((m) => m.id === file.selectedModel)) file.selectedModel = AUTO_MODEL_ID;
+  const w = writeFile(file);
+  return w.ok ? { ok: true, models: next } : w;
+}
+
 /** Never render a key in full - this is what goes on screen and in logs. */
 function maskKey(key) {
   if (!key) return '(none)';
@@ -388,5 +467,6 @@ module.exports = {
   getConfig, saveConfig, maskKey, describeProvider, describeProviderShort, byokHint,
   configPath, PROVIDERS, BYOK_PROVIDERS,
   getIntegration, saveIntegration, disconnectIntegration, isIntegrationConnected, INTEGRATIONS,
-  AUTO_MODEL_ID, getModels, getModel, getSelectedModel, getSelectedModelId, saveModel, deleteModel, selectModel,
+  AUTO_MODEL_ID, getModels, getModel, getSelectedModel, getSelectedModelId, saveModel, deleteModel, selectModel, syncChatGPTModels,
+  setModelPhone, getPhoneDeletes, setPhoneDeletes,
 };

package/lib/design-library/assemble-artifact.mjs

@@ -1,21 +1,21 @@
-import { readFileSync, writeFileSync } from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const template = readFileSync(path.join(__dirname, 'artifact-template.html'), 'utf8');
-const data = JSON.parse(readFileSync(path.join(__dirname, 'table-data.json'), 'utf8'));
-
-const totalApps = data.rows.length;
-const totalShots = data.rows.reduce((s, r) => s + r.s, 0);
-const generatedAt = new Date(data.generatedAt).toISOString().slice(0, 16).replace('T', ' ') + ' UTC';
-
-const out = template
-  .replace('__DATA_JSON__', JSON.stringify(data).replace(/</g, '\\u003c'))
-  .replace('__GENERATED_AT__', generatedAt)
-  .replace('__TOTAL_APPS__', String(totalApps))
-  .replace('__TOTAL_SHOTS__', String(totalShots));
-
-const outPath = process.argv[2];
-writeFileSync(outPath, out);
-console.log('wrote', outPath, '(' + (out.length / 1024).toFixed(0) + ' KB)');
+import { readFileSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const template = readFileSync(path.join(__dirname, 'artifact-template.html'), 'utf8');
+const data = JSON.parse(readFileSync(path.join(__dirname, 'table-data.json'), 'utf8'));
+
+const totalApps = data.rows.length;
+const totalShots = data.rows.reduce((s, r) => s + r.s, 0);
+const generatedAt = new Date(data.generatedAt).toISOString().slice(0, 16).replace('T', ' ') + ' UTC';
+
+const out = template
+  .replace('__DATA_JSON__', JSON.stringify(data).replace(/</g, '\\u003c'))
+  .replace('__GENERATED_AT__', generatedAt)
+  .replace('__TOTAL_APPS__', String(totalApps))
+  .replace('__TOTAL_SHOTS__', String(totalShots));
+
+const outPath = process.argv[2];
+writeFileSync(outPath, out);
+console.log('wrote', outPath, '(' + (out.length / 1024).toFixed(0) + ' KB)');

package/lib/design-library/cleanup.mjs

@@ -1,45 +1,45 @@
-import { readFileSync, writeFileSync } from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const OUT_PATH = path.join(__dirname, 'index.json');
-
-// [category, appId] pairs confirmed as wrong-category mismatches on manual review.
-// Same app can be a correct match in one category and a mismatch in another
-// (e.g. "BetterHelp" is a real health_fitness app but wrongly matched a
-// real_estate search term), so removal is scoped per (category, id), not global.
-const REMOVE = [
-  ['productivity', 6470821480],  // "Zapia" matched from "Zapier" search - unrelated app
-  ['productivity', 1038369065],  // "Flo Cycle & Period Tracker" matched from "Glo" - wrong app (correct in health_fitness)
-  ['productivity', 1573566111],  // "Complices" matched from "Complice" - unrelated French dating app
-  ['shopping', 6748155184],      // "Courtyard: TCG, Watches, Cards" - unrelated marketplace
-  ['food_delivery', 1416720539], // "Tango Reserve by AgilQuest" matched from generic "Reserve" search - enterprise workspace booking, not food
-  ['food_delivery', 6748155184], // "Courtyard" again - unrelated
-  ['real_estate', 995252384],    // "BetterHelp - Therapy" matched from "Better.com" - wrong app (correct in health_fitness)
-  ['real_estate', 1264782561],   // "Co-Star Personalized Astrology" matched from "CoStar" - astrology app, not commercial real estate data
-  ['real_estate', 1457119021],   // "Rainbow - Ethereum Wallet" - unrelated crypto wallet
-  ['real_estate', 407108860],    // "Cozi Family Organizer" - unrelated family calendar app
-  ['real_estate', 880735556],    // "Gods of Olympus" matched from "Zeus Living" - unrelated mobile game
-];
-
-const idx = JSON.parse(readFileSync(OUT_PATH, 'utf8'));
-let removed = 0;
-for (const [cat, id] of REMOVE) {
-  const before = idx.categories[cat].length;
-  idx.categories[cat] = idx.categories[cat].filter((a) => a.id !== id);
-  removed += before - idx.categories[cat].length;
-}
-
-idx.cleanedAt = new Date().toISOString();
-writeFileSync(OUT_PATH, JSON.stringify(idx, null, 2));
-console.log(`Removed ${removed} confirmed-mismatch entries.`);
-
-let totalApps = 0, totalShots = 0;
-for (const [cat, apps] of Object.entries(idx.categories)) {
-  const shots = apps.reduce((s, a) => s + a.screenshots.length, 0);
-  totalApps += apps.length;
-  totalShots += shots;
-  console.log(`${cat}: ${apps.length} apps, ${shots} screenshots`);
-}
-console.log(`\nFinal: ${totalApps} apps, ${totalShots} screenshots`);
+import { readFileSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const OUT_PATH = path.join(__dirname, 'index.json');
+
+// [category, appId] pairs confirmed as wrong-category mismatches on manual review.
+// Same app can be a correct match in one category and a mismatch in another
+// (e.g. "BetterHelp" is a real health_fitness app but wrongly matched a
+// real_estate search term), so removal is scoped per (category, id), not global.
+const REMOVE = [
+  ['productivity', 6470821480],  // "Zapia" matched from "Zapier" search - unrelated app
+  ['productivity', 1038369065],  // "Flo Cycle & Period Tracker" matched from "Glo" - wrong app (correct in health_fitness)
+  ['productivity', 1573566111],  // "Complices" matched from "Complice" - unrelated French dating app
+  ['shopping', 6748155184],      // "Courtyard: TCG, Watches, Cards" - unrelated marketplace
+  ['food_delivery', 1416720539], // "Tango Reserve by AgilQuest" matched from generic "Reserve" search - enterprise workspace booking, not food
+  ['food_delivery', 6748155184], // "Courtyard" again - unrelated
+  ['real_estate', 995252384],    // "BetterHelp - Therapy" matched from "Better.com" - wrong app (correct in health_fitness)
+  ['real_estate', 1264782561],   // "Co-Star Personalized Astrology" matched from "CoStar" - astrology app, not commercial real estate data
+  ['real_estate', 1457119021],   // "Rainbow - Ethereum Wallet" - unrelated crypto wallet
+  ['real_estate', 407108860],    // "Cozi Family Organizer" - unrelated family calendar app
+  ['real_estate', 880735556],    // "Gods of Olympus" matched from "Zeus Living" - unrelated mobile game
+];
+
+const idx = JSON.parse(readFileSync(OUT_PATH, 'utf8'));
+let removed = 0;
+for (const [cat, id] of REMOVE) {
+  const before = idx.categories[cat].length;
+  idx.categories[cat] = idx.categories[cat].filter((a) => a.id !== id);
+  removed += before - idx.categories[cat].length;
+}
+
+idx.cleanedAt = new Date().toISOString();
+writeFileSync(OUT_PATH, JSON.stringify(idx, null, 2));
+console.log(`Removed ${removed} confirmed-mismatch entries.`);
+
+let totalApps = 0, totalShots = 0;
+for (const [cat, apps] of Object.entries(idx.categories)) {
+  const shots = apps.reduce((s, a) => s + a.screenshots.length, 0);
+  totalApps += apps.length;
+  totalShots += shots;
+  console.log(`${cat}: ${apps.length} apps, ${shots} screenshots`);
+}
+console.log(`\nFinal: ${totalApps} apps, ${totalShots} screenshots`);