Feat: --continue to use assistant prompt (#137)

cli/src/args.ts

@@ -11,6 +11,7 @@ export function makeArgs(argv = process.argv) {
       out: { type: "string", short: "o" },
       isolated: { type: "boolean", default: false, short: "i" },
       combined: { type: "boolean", default: false },
+      continue: { type: "boolean", default: false },
       "no-overwrite": { type: "boolean", default: false },
       edit: { type: "boolean", default: false, short: "e" },
       lines: { type: "string", default: "", short: "l" },
@@ -89,6 +90,7 @@ export function help() {
       'folder' includes all files in the folder at the same level as the current file when generating. Default with --edit.
       'none' includes no additional content (including no system context) when generating.
       (note: context is separate from isolated. isolated: true with either 'content' or 'folder' will result in the same behavior with either. With 'none', Ailly will send _only_ the prompt when generating.)
+    --continue when a response is present, will include that response as the "assistant" message to begin inference from.
 
     --clean resets all your ailly files to have no debug, no response, and minimal head matter settings.
     -e, --edit use Ailly in edit mode. Provide a single file in paths, an edit marker, and a prompt. The path will be updated with the edit marker at the prompt.

cli/src/fs.ts

@@ -75,6 +75,7 @@ export async function loadFs(
     context: argContext,
     isolated: args.values.isolated,
     combined: args.values.combined,
+    continued: args.values.continue,
     engine: args.values.engine,
     model: args.values.model,
     plugin: args.values.plugin,

core/src/content/content.ts

@@ -62,6 +62,7 @@ export interface ContentMeta {
   text?: string;
   context?: "conversation" | "folder" | "none";
   parent?: "root" | "always" | "never";
+  continue?: boolean;
   messages?: Message[];
   skip?: boolean;
   skipHead?: boolean;

core/src/engine/bedrock/bedrock.ts

@@ -75,7 +75,7 @@ export const generate: EngineGenerate<BedrockDebug> = (
   });
 
   try {
-    let message = "";
+    let message = c.meta?.continue ? c.response ?? "" : "";
     const debug: BedrockDebug = {
       id: "",
       finish: "unknown",

core/src/engine/messages.ts

@@ -12,14 +12,15 @@ export async function addContentMessages(
     content.meta.messages = getMessagesFolder(content, context);
   else content.meta.messages = getMessagesPredecessor(content, context);
   let messages = content.meta.messages;
-  if (messages.at(-1)?.role == "assistant") {
+  if (
+    messages.at(-1)?.role == "assistant" &&
+    (content.context.edit || !content.meta.continue)
+  ) {
     messages.splice(-1, 1);
   }
-  let fence: undefined | string = undefined;
   if (content.context.edit) {
     const lang = content.context.edit.file.split(".").at(-1) ?? "";
-    fence = "```" + lang;
-    messages.push({ role: "assistant", content: fence });
+    messages.push({ role: "assistant", content: "```" + lang });
   }
 }
 

core/src/engine/openai.ts

@@ -49,7 +49,7 @@ export const generate: EngineGenerate<OpenAIDebug> = (
   };
 
   try {
-    let message = "";
+    let message = c.meta?.continue ? c.response ?? "" : "";
     let chunkNum = 0;
     const stream = new TransformStream();
 

core/src/index.ts

@@ -32,6 +32,7 @@ export interface PipelineSettings {
   isolated: boolean;
   combined: boolean | undefined;
   skipHead: boolean;
+  continue: boolean;
   overwrite: boolean;
   templateView: View;
 }
@@ -47,6 +48,7 @@ export async function makePipelineSettings({
   overwrite = true,
   isolated = false,
   skipHead = false,
+  continued = false,
   combined,
   templateView = {},
 }: {
@@ -60,6 +62,7 @@ export async function makePipelineSettings({
   isolated?: boolean;
   combined?: boolean;
   skipHead?: boolean;
+  continued?: boolean;
   requestLimit?: number;
   templateView?: View;
 }): Promise<PipelineSettings> {
@@ -75,6 +78,7 @@ export async function makePipelineSettings({
     requestLimit,
     context: context as NonNullable<ContentMeta["context"]>,
     plugin,
+    continue: continued,
     overwrite,
     isolated,
     combined,

extension/package.json

@@ -38,6 +38,10 @@
         "title": "Ailly: Clean",
         "enablement": "explorerViewletFocus"
       },
+      {
+        "command": "ailly.continue",
+        "title": "Ailly: Continue"
+      },
       {
         "command": "ailly.edit",
         "title": "Ailly: Edit"
@@ -53,6 +57,11 @@
           "command": "ailly.generate.all",
           "group": "3_generate"
         },
+        {
+          "command": "ailly.continue",
+          "group": "1_modification",
+          "when": "!explorerResourceIsFolder"
+        },
         {
           "command": "ailly.clean",
           "group": "3_generate"

extension/src/extension.ts

@@ -35,6 +35,14 @@ export function activate(context: vscode.ExtensionContext) {
     deep: true,
   });
 
+  registerGenerateCommand(context, {
+    name: "continue",
+    manager: statusManager,
+    continued: true,
+    gerund: "continuing",
+    pastpart: "continued",
+  });
+
   registerGenerateCommand(context, {
     name: "clean",
     manager: statusManager,
@@ -84,6 +92,7 @@ export function registerGenerateCommand(
     edit = false,
     clean = false,
     deep = false,
+    continued = false,
     gerund,
     pastpart,
     infinitive = name,
@@ -93,6 +102,7 @@ export function registerGenerateCommand(
     clean?: boolean;
     edit?: boolean;
     deep?: boolean;
+    continued?: boolean;
     gerund: string;
     pastpart: string;
     infinitive?: string;
@@ -137,6 +147,8 @@ export function registerGenerateCommand(
             await generate(path, {
               manager,
               clean,
+              depth: deep ? Number.MAX_SAFE_INTEGER : 1,
+              continued,
               extensionEdit,
             });
             vscode.window.showInformationMessage(`Ailly ${pastpart} ${base}`);

extension/src/generate.ts

@@ -31,11 +31,13 @@ export async function generate(
     extensionEdit,
     manager,
     clean = false,
+    continued = false,
     depth = 1,
   }: {
     extensionEdit?: ExtensionEdit;
     manager: StatusManager;
     clean?: boolean;
+    continued?: boolean;
     depth?: number;
   }
 ) {
@@ -58,6 +60,7 @@ export async function generate(
     root,
     out: root,
     context: "folder",
+    continued,
     engine,
     model,
   });

integ/07_conversation_continue/conversation.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -x
+set -e
+
+cd $(dirname $0)
+
+rm -f ./out ./err
+git restore ./root/01_a.txt.ailly.md
+
+###
+
+echo "continued conversation"
+npx ailly --root ./root --log-format json --verbose --continue > >(tee ./out) 2> >(tee ./err >&2)
+tail ./out ./err
+[ ! -s ./err ] # No error output at all
+
+MESSAGES=(
+  "user: File a"
+  "assistant: Continuing response"
+)
+for M in "${MESSAGES[@]}"; do
+  grep -q "$M" ./root/01_a.txt.ailly.md
+done
+
+echo "(continued conversation messages checked)"
+rm -f ./out ./err
+git restore ./root/01_a.txt.ailly.md

integ/07_conversation_continue/root/01_a.txt

@@ -0,0 +1 @@
+File a.

integ/07_conversation_continue/root/01_a.txt.ailly.md

@@ -0,0 +1 @@
+Continuing response.