@maycombhq/atticus 2.0.0-beta.22 → 2.0.0-beta.24

package/dist/{chunk-KQGURXFU.js → chunk-YLZNTVZR.js}

@@ -7,16 +7,16 @@ import {
   INPUTS_SOURCE,
   INPUTS_SOURCE_ID,
   inputsPages
-} from "./chunk-D73UEXYW.js";
+} from "./chunk-UXO25YBN.js";
 import {
   judgingRuntime
-} from "./chunk-PAQ2AS5E.js";
+} from "./chunk-YF6N45QN.js";
 import {
   table
 } from "./chunk-VOGCSYOI.js";
 import {
   readCatalog
-} from "./chunk-J2JAKCIW.js";
+} from "./chunk-25CUJJTP.js";
 import {
   checkoutGitWiki,
   coverage,
@@ -28,17 +28,25 @@ import {
   syncSources,
   toApiCoverage,
   writeSnapshots
-} from "./chunk-745DAZ4L.js";
+} from "./chunk-CZ75S2EZ.js";
 import {
   createGit
-} from "./chunk-PKBHS4AA.js";
+} from "./chunk-OSZTENIA.js";
 import {
-  Sources,
+  eolOf,
   fileJudgments,
+  inEol,
   inputsDirOf,
-  loadOrgPack,
+  lfOnly,
   orgPackDirOf
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
+import {
+  writeFileIfUnchanged
+} from "./chunk-G3ZFEHCX.js";
+import {
+  Sources,
+  loadOrgPack
+} from "./chunk-QFDPX6C4.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";
@@ -47,7 +55,7 @@ import {
 } from "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/knowledge-commands.js
-import { readFile, stat, writeFile } from "node:fs/promises";
+import { readFile, stat } from "node:fs/promises";
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
 var import_yaml = __toESM(require_dist(), 1);
 var WIKI_TYPES = ["confluence", "ado-wiki", "sharepoint", "markdown-folder", "git"];
@@ -76,6 +84,7 @@ async function load(root, io) {
 }
 var systemsOf = (op) => op.profiles.flatMap((p) => p.profile?.systems ?? []);
 var now = () => (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z");
+var hasCredentials = (s) => /^https?:\/\/[^/?#\s]*@/i.test(s.trim()) || /^[a-z][a-z0-9+.-]*:\/\/[^/?#@\s]*:[^/?#@\s]*@/i.test(s.trim());
 var isRemote = (s) => /^[a-z][a-z0-9+.-]*:\/\//i.test(s) || /^[\w.-]+@[\w.-]+:/.test(s);
 async function sourcesAdd(root, kind, location, io, o = {}) {
   if (!WIKI_TYPES.includes(kind)) {
@@ -87,6 +96,10 @@ async function sourcesAdd(root, kind, location, io, o = {}) {
     io.err("--path, --ref and --submodule are for a git wiki.");
     return 2;
   }
+  if (hasCredentials(location)) {
+    io.err("That address has a user name or token in it, and sources.yaml is shared with everyone who reads the org pack. Give the address without them (https://host/path), and let Git's credential helper or an environment variable give them when the wiki is read.");
+    return 1;
+  }
   const orgPackDir = join(orgPackDirOf(root));
   const op = await loadOrgPack(orgPackDir);
   let entryLocation;
@@ -160,13 +173,22 @@ async function sourcesAdd(root, kind, location, io, o = {}) {
   }
   if (o.save) {
     const file = join(orgPackDir, "sources.yaml");
-    const doc = (0, import_yaml.parseDocument)(await readFile(file, "utf8").catch(() => "# Where things are and what Atticus reads.\nschemaVersion: 1\n"));
+    const onDisk = await readFile(file, "utf8").catch(() => void 0);
+    const text = onDisk ?? "# Where things are and what Atticus reads.\nschemaVersion: 1\n";
+    const doc = (0, import_yaml.parseDocument)(lfOnly(text));
     const wikis = doc.get("wikis");
-    if ((0, import_yaml.isSeq)(wikis))
+    if ((0, import_yaml.isSeq)(wikis)) {
+      if (!wikis.items.length)
+        wikis.flow = false;
       wikis.add(doc.createNode(entry));
-    else
+    } else
       doc.set("wikis", doc.createNode([entry]));
-    await writeFile(file, doc.toString(), "utf8");
+    const recheck = Sources.safeParse(doc.toJS());
+    if (!recheck.success) {
+      io.err(recheck.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join("\n"));
+      return 1;
+    }
+    await writeFileIfUnchanged(file, onDisk, inEol(doc.toString(), eolOf(text)));
     io.out(`Added ${entry.id} (${type}) to org-pack/sources.yaml: commit it through a pull request.`);
     io.out(`Then read it: atticus sources sync --source ${entry.id}, and atticus knowledge scan --source ${entry.id}.`);
     return 0;
@@ -424,6 +446,7 @@ async function questionsCommand(root, io, o) {
 }
 
 export {
+  hasCredentials,
   sourcesAdd,
   sourcesSync,
   patternsScan,

package/dist/{chunk-NY2XSR5K.js → chunk-YUJTOALL.js}

@@ -58,6 +58,7 @@ import {
   NEEDS_FINDER,
   NEEDS_MD,
   NEEDS_OUTPUT,
+  NUMBERS_FILE,
   Need,
   NeedsFile,
   PAST_CORRECTIONS_MAX,
@@ -66,10 +67,13 @@ import {
   PERSON_DRAFT,
   PROPOSALS_DIR,
   PROPOSAL_MARK,
+  PROPOSAL_THREAD,
   PROTOTYPE_NEW_RULE,
   PlannerError,
   READS_FILE,
   READ_AGAIN_RULE,
+  REPLY_AGAIN_MS,
+  REPLY_COMMAND,
   RERANK_AGENT,
   RERANK_SHOWN,
   ReadFlow,
@@ -82,6 +86,8 @@ import {
   SECTION_TOKENS,
   SEED_MARK,
   SELF_CHECK_RULE,
+  SHAPE_FILE,
+  SHAPE_RULE,
   SKETCH_RULE,
   SMALL_AGENT,
   SMALL_ANSWER_FILE,
@@ -97,14 +103,18 @@ import {
   STORY_PROSE_OUTPUT,
   STORY_WRITER,
   SYNC_FILE,
+  ShapeEntry,
+  ShapeError,
   SmallAnswer,
   SnowFillError,
   StoriesAnswerSchema,
+  StoriesShape,
   StoryCriterion,
   StoryDataChange,
   StoryEval,
   StoryInterfaceChange,
   StoryInterfaceField,
+  StoryNumbers,
   Stroke,
   SyncFile,
   TARGET_DIR,
@@ -115,6 +125,7 @@ import {
   TEMPLATE_PROSE_CHANGE,
   TEMPLATE_PROSE_OUTPUT,
   TEMPLATE_WRITER,
+  THREAD_STAGES,
   TargetFlowsAnswer,
   YAML_QUOTE_RULE,
   acceptingCriteria,
@@ -122,11 +133,13 @@ import {
   addedFlowsOf,
   allowedValuesOf,
   allowedValuesSource,
+  applyShape,
   applyStroke,
   architectureStage,
   asSources,
   askGaps,
   askKnowledgeConflicts,
+  assignFromAnswer,
   baseProblem,
   breakingChanges,
   briefEndpointNotes,
@@ -197,6 +210,7 @@ import {
   draftedStories,
   drawnBy,
   drawnStrokes,
+  droppedQuestion,
   emptyDeltaIssues,
   endpointConsumers,
   endpointKey,
@@ -208,6 +222,7 @@ import {
   estateLine,
   estateOf,
   excludedKnowledge,
+  existingSpecs,
   expandFor,
   expansionInput,
   failedAnswerRel,
@@ -249,9 +264,12 @@ import {
   judgeRuntime,
   judged,
   judgedRequests,
+  keepDroppedQuestion,
+  keepStoryNumbers,
   knowledgeAppliesMarkdown,
   knownFieldNames,
   knownSources,
+  lastPart,
   lastValidRel,
   lineAtFolded,
   lineExists,
@@ -259,8 +277,10 @@ import {
   loadPlanContext,
   locateInTargetFlows,
   markNeed,
+  markProposalRepliesRead,
   mergeDelta,
   mergeRequests,
+  mergeStoryNumbers,
   mergeStoryRequests,
   mergedFlowsSource,
   mergedFlowsText,
@@ -268,6 +288,8 @@ import {
   metarepoOpenSpec,
   migrationPath,
   migrationsOf,
+  namesExpansion,
+  namesIn,
   namesOf,
   nearDuplicates,
   needQuoteProblem,
@@ -278,6 +300,9 @@ import {
   noteCiteOf,
   noteConflictLines,
   noteQuestions,
+  numberedStories,
+  numbersWithMoved,
+  oneLine,
   oneSource,
   openSeeds,
   openspecFiles,
@@ -288,6 +313,7 @@ import {
   outsideSystems,
   overlap,
   ownNames,
+  ownSections,
   pageMeta,
   parseDraft,
   parseProse,
@@ -303,6 +329,8 @@ import {
   planSketchWrite,
   planStories,
   planText,
+  plannedComponents,
+  plannedRepos,
   promptFileOf,
   prototypeNewCallsSource,
   questionsOnFile,
@@ -318,22 +346,26 @@ import {
   readKnowledgeApplies,
   readNeeds,
   readPlacement,
+  readShape,
   readStageLoop,
   readStories,
   readStoriesAnswer,
   readStoryEval,
+  readStoryNumbers,
   readSyncFile,
   readTargetFlows,
   readTaskSteps,
   recordAiDraft,
   recordKnowledge,
   recordPersonSave,
+  recordShape,
   recordTaskKnowledge,
   refreshTaskConflicts,
   refuseWhileEarlierStuck,
   relevantMap,
   reliedOn,
   removeCorrection,
+  removeShape,
   renderArchitecture,
   renderBreaking,
   renderData,
@@ -352,6 +384,7 @@ import {
   renderTaskContext,
   renderTasks,
   repeatedFindings,
+  replyInStage,
   reportOf,
   requestFieldsOf,
   rerankFor,
@@ -378,6 +411,11 @@ import {
   setKnowledgeStatus,
   settleCorrections,
   settleCoversAnswers,
+  shapeAfterDraft,
+  shapeIssues,
+  shapePrompt,
+  shapeView,
+  shapedStories,
   sketchFingerprint,
   sketchOf,
   sketchSlug,
@@ -403,6 +441,7 @@ import {
   stem,
   stepFacts,
   stepJudges,
+  stepKeys,
   stepQuestionJudge,
   stepTasks,
   stopMessage,
@@ -419,8 +458,10 @@ import {
   storyCodeSource,
   storyColumns,
   storyExtras,
+  storyKey,
   storyKnowledgeLines,
   storyNotes,
+  storyNumber,
   storyPack,
   storySteps,
   storyWriter,
@@ -435,10 +476,14 @@ import {
   taskKnowledgeInput,
   taskKnowledgeSource,
   taskLabel,
+  taskName,
   taskPrompt,
   taskPromptFiles,
+  taskRunNotes,
   templateWriter,
   templateYaml,
+  threadReplies,
+  threadRerun,
   tickedTasks,
   titledText,
   touchedTables,
@@ -446,11 +491,13 @@ import {
   unfence,
   unjudgedChecks,
   unwrittenChecks,
+  updateStageLoop,
   useEngine,
   validateDraft,
   whenFromLeadTime,
   wholeLists,
   withBuildLine,
+  withStoriesLock,
   withTools,
   withoutResume,
   wordsOnlyNote,
@@ -459,14 +506,16 @@ import {
   writePlacement,
   writeProposal,
   writeProse,
+  writeShape,
   writeSketch,
   writeSpecFiles,
   writeStageLoop,
   writeStories,
+  writeStoryNumbers,
   writeTargetFlows,
   writesField,
   yamlOf
-} from "./chunk-R7NYHMUU.js";
+} from "./chunk-WECCLSYY.js";
 import {
   Backing,
   DeltaFields,
@@ -492,26 +541,28 @@ import {
   rerunOf,
   usesOf,
   waitingQuestions
-} from "./chunk-IVBOQAGB.js";
-import "./chunk-ISUAAMGS.js";
+} from "./chunk-5FUFVNXB.js";
 import {
   MERGED_FLOWS
-} from "./chunk-S4PMJU6H.js";
-import "./chunk-IDKCWSM5.js";
-import "./chunk-UUU4CLJG.js";
-import "./chunk-7IGKHZ4Z.js";
-import "./chunk-J2JAKCIW.js";
-import "./chunk-745DAZ4L.js";
-import "./chunk-CXJ6FUKN.js";
-import "./chunk-QKUJMING.js";
-import "./chunk-6ZGLAACW.js";
-import "./chunk-CQDGOPGH.js";
-import "./chunk-3NFFJL5D.js";
-import "./chunk-PKBHS4AA.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-A6ZG3UOS.js";
+import "./chunk-U2JTTRKS.js";
+import "./chunk-5MKV4TV6.js";
+import "./chunk-ESJALLOK.js";
+import "./chunk-MCE74XMF.js";
+import "./chunk-25CUJJTP.js";
+import "./chunk-HNPKCRCE.js";
+import "./chunk-CZ75S2EZ.js";
+import "./chunk-GFYVVTKH.js";
+import "./chunk-DIYNRYXW.js";
+import "./chunk-5FPAKAGE.js";
+import "./chunk-IJQHBK76.js";
+import "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
-import "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+import "./chunk-OSZTENIA.js";
+import "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 var export_yamlText = import_yaml.stringify;
@@ -582,6 +633,7 @@ export {
   NEEDS_FINDER,
   NEEDS_MD,
   NEEDS_OUTPUT,
+  NUMBERS_FILE,
   Need,
   NeedsFile,
   ON_DELETE,
@@ -591,10 +643,13 @@ export {
   PERSON_DRAFT,
   PROPOSALS_DIR,
   PROPOSAL_MARK,
+  PROPOSAL_THREAD,
   PROTOTYPE_NEW_RULE,
   PlannerError,
   READS_FILE,
   READ_AGAIN_RULE,
+  REPLY_AGAIN_MS,
+  REPLY_COMMAND,
   RERANK_AGENT,
   RERANK_SHOWN,
   ReadFlow,
@@ -607,6 +662,8 @@ export {
   SECTION_TOKENS,
   SEED_MARK,
   SELF_CHECK_RULE,
+  SHAPE_FILE,
+  SHAPE_RULE,
   SKETCH_RULE,
   SMALL_AGENT,
   SMALL_ANSWER_FILE,
@@ -625,6 +682,8 @@ export {
   STORY_PROSE_OUTPUT,
   STORY_WRITER,
   SYNC_FILE,
+  ShapeEntry,
+  ShapeError,
   FlowDelta as SketchDelta,
   SmallAnswer,
   SnowFillError,
@@ -632,11 +691,13 @@ export {
   StageLoop,
   StoreKey,
   StoriesAnswerSchema,
+  StoriesShape,
   StoryCriterion,
   StoryDataChange,
   StoryEval,
   StoryInterfaceChange,
   StoryInterfaceField,
+  StoryNumbers,
   Stroke,
   SyncFile,
   TARGET_DIR,
@@ -647,6 +708,7 @@ export {
   TEMPLATE_PROSE_CHANGE,
   TEMPLATE_PROSE_OUTPUT,
   TEMPLATE_WRITER,
+  THREAD_STAGES,
   TargetFlowsAnswer,
   YAML_QUOTE_RULE,
   acceptingCriteria,
@@ -654,11 +716,13 @@ export {
   addedFlowsOf,
   allowedValuesOf,
   allowedValuesSource,
+  applyShape,
   applyStroke,
   architectureStage,
   asSources,
   askGaps,
   askKnowledgeConflicts,
+  assignFromAnswer,
   baseProblem,
   breakingChanges,
   briefEndpointNotes,
@@ -729,6 +793,7 @@ export {
   draftedStories,
   drawnBy,
   drawnStrokes,
+  droppedQuestion,
   emptyDeltaIssues,
   endpointConsumers,
   endpointKey,
@@ -740,6 +805,7 @@ export {
   estateLine,
   estateOf,
   excludedKnowledge,
+  existingSpecs,
   expandFor,
   expansionInput,
   failedAnswerRel,
@@ -781,9 +847,12 @@ export {
   judgeRuntime,
   judged,
   judgedRequests,
+  keepDroppedQuestion,
+  keepStoryNumbers,
   knowledgeAppliesMarkdown,
   knownFieldNames,
   knownSources,
+  lastPart,
   lastValidRel,
   lineAtFolded,
   lineExists,
@@ -791,8 +860,10 @@ export {
   loadPlanContext,
   locateInTargetFlows,
   markNeed,
+  markProposalRepliesRead,
   mergeDelta,
   mergeRequests,
+  mergeStoryNumbers,
   mergeStoryRequests,
   mergedFlowsSource,
   mergedFlowsText,
@@ -800,6 +871,8 @@ export {
   metarepoOpenSpec,
   migrationPath,
   migrationsOf,
+  namesExpansion,
+  namesIn,
   namesOf,
   nearDuplicates,
   needQuoteProblem,
@@ -810,6 +883,9 @@ export {
   noteCiteOf,
   noteConflictLines,
   noteQuestions,
+  numberedStories,
+  numbersWithMoved,
+  oneLine,
   oneSource,
   openSeeds,
   openspecFiles,
@@ -820,6 +896,7 @@ export {
   outsideSystems,
   overlap,
   ownNames,
+  ownSections,
   pageMeta,
   parseAt,
   parseDraft,
@@ -837,6 +914,8 @@ export {
   planSketchWrite,
   planStories,
   planText,
+  plannedComponents,
+  plannedRepos,
   promptFileOf,
   prototypeNewCallsSource,
   questionsOnFile,
@@ -852,22 +931,26 @@ export {
   readKnowledgeApplies,
   readNeeds,
   readPlacement,
+  readShape,
   readStageLoop,
   readStories,
   readStoriesAnswer,
   readStoryEval,
+  readStoryNumbers,
   readSyncFile,
   readTargetFlows,
   readTaskSteps,
   recordAiDraft,
   recordKnowledge,
   recordPersonSave,
+  recordShape,
   recordTaskKnowledge,
   refreshTaskConflicts,
   refuseWhileEarlierStuck,
   relevantMap,
   reliedOn,
   removeCorrection,
+  removeShape,
   renderArchitecture,
   renderBreaking,
   renderData,
@@ -886,6 +969,7 @@ export {
   renderTaskContext,
   renderTasks,
   repeatedFindings,
+  replyInStage,
   reportOf,
   requestFieldsOf,
   rerankFor,
@@ -913,6 +997,11 @@ export {
   setKnowledgeStatus,
   settleCorrections,
   settleCoversAnswers,
+  shapeAfterDraft,
+  shapeIssues,
+  shapePrompt,
+  shapeView,
+  shapedStories,
   sketchFingerprint,
   sketchOf,
   sketchSlug,
@@ -938,6 +1027,7 @@ export {
   stem,
   stepFacts,
   stepJudges,
+  stepKeys,
   stepQuestionJudge,
   stepTasks,
   stopMessage,
@@ -954,8 +1044,10 @@ export {
   storyCodeSource,
   storyColumns,
   storyExtras,
+  storyKey,
   storyKnowledgeLines,
   storyNotes,
+  storyNumber,
   storyPack,
   storySteps,
   storyWriter,
@@ -970,10 +1062,14 @@ export {
   taskKnowledgeInput,
   taskKnowledgeSource,
   taskLabel,
+  taskName,
   taskPrompt,
   taskPromptFiles,
+  taskRunNotes,
   templateWriter,
   templateYaml,
+  threadReplies,
+  threadRerun,
   tickedTasks,
   titledText,
   touchedTables,
@@ -981,6 +1077,7 @@ export {
   unfence,
   unjudgedChecks,
   unwrittenChecks,
+  updateStageLoop,
   useEngine,
   usesOf,
   validateDraft,
@@ -988,6 +1085,7 @@ export {
   whenFromLeadTime,
   wholeLists,
   withBuildLine,
+  withStoriesLock,
   withTools,
   withoutResume,
   wordsOnlyNote,
@@ -996,10 +1094,12 @@ export {
   writePlacement,
   writeProposal,
   writeProse,
+  writeShape,
   writeSketch,
   writeSpecFiles,
   writeStageLoop,
   writeStories,
+  writeStoryNumbers,
   writeTargetFlows,
   writesField,
   yamlOf,

package/dist/{chunk-VZALIKIF.js → chunk-Z5YDTIWQ.js}

@@ -7,12 +7,12 @@ import {
   exportFrameworksKit,
   formatFrameworkSurvey,
   surveyFrameworks
-} from "./chunk-O7FDLW7L.js";
-import "./chunk-J2JAKCIW.js";
-import "./chunk-745DAZ4L.js";
-import "./chunk-CXJ6FUKN.js";
-import "./chunk-QKUJMING.js";
-import "./chunk-6ZGLAACW.js";
+} from "./chunk-BYKWWSXL.js";
+import "./chunk-25CUJJTP.js";
+import "./chunk-HNPKCRCE.js";
+import "./chunk-CZ75S2EZ.js";
+import "./chunk-GFYVVTKH.js";
+import "./chunk-DIYNRYXW.js";
 import {
   houseDependencies,
   learnFramework,
@@ -20,23 +20,26 @@ import {
   learnJsFramework,
   learnJsFrameworkFromTarball,
   runFrameworkTests
-} from "./chunk-CQDGOPGH.js";
+} from "./chunk-5FPAKAGE.js";
 import {
   fsRepo
-} from "./chunk-3NFFJL5D.js";
+} from "./chunk-IJQHBK76.js";
+import "./chunk-MOWUP33K.js";
+import "./chunk-QA4O2GGC.js";
 import {
   baseClonePath
-} from "./chunk-PKBHS4AA.js";
-import "./chunk-P32RUW3B.js";
-import "./chunk-QA4O2GGC.js";
+} from "./chunk-OSZTENIA.js";
 import {
-  FrameworkModel,
-  RecordId,
-  loadOrgPack,
   orgPackDirOf,
   toCanonicalYaml
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import {
+  FrameworkModel,
+  RecordId,
+  loadOrgPack
+} from "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";