Compile and publish extension

.github/workflows/extension.yaml

@@ -0,0 +1,30 @@
+name: Package Extension
+
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  npm-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20.x"
+
+      - name: Install dependencies
+        run: npm install && npx tsc -p core && npm link ./core -w cli
+
+      - name: Package Extension
+        run: npm run --workspace extension
+
+      - name: Publish extension artifact
+        uses: actions/upload-artifact
+        with:
+          name: extension
+          path: extension/ailly-*.vsix

.vscode/launch.json

@@ -12,8 +12,8 @@
         "--profile-temp",
         "--extensionDevelopmentPath=${workspaceFolder}/extension"
       ],
-      "outFiles": ["${workspaceFolder}/extension/out/**/*.js"],
-      "preLaunchTask": "${defaultBuildTask}"
+      "outFiles": ["${workspaceFolder}/extension/out/**/*.js"]
+      // "preLaunchTask": "${defaultBuildTask}"
     },
     {
       "name": "Ailly Extension Tests",

cli/fs.js

@@ -27,7 +27,6 @@ export async function loadFs(fs, args) {
   const root = resolve(args.values.root ?? '.');
   fs.cd(root);
 
-
   const settings = await ailly.Ailly.makePipelineSettings({
     root,
     out: resolve(args.values.out ?? root),

cli/index.js

@@ -6,7 +6,6 @@ import * as ailly from "@ailly/core";
 import { makeArgs, help } from "./args.js";
 import { loadFs, LOGGER } from "./fs.js";
 import { version } from "./version.js";
-import { promisify } from "node:util";
 
 await main();
 

core/index.ts

@@ -18,7 +18,7 @@ export const content = {
 };
 
 export const Ailly = aillyModule;
-export const version = getVersion(import.meta.url);
+export const version = getVersion(import.meta?.url ?? "file://" + __filename);
 
 // TODO move this to jiffies
 import { execSync } from "node:child_process";
@@ -27,10 +27,14 @@ import { normalize, join } from "node:path";
 import { readFileSync } from "node:fs";
 
 export function getVersion(root: /*ImportMeta.URL*/ string) {
-  const cwd = normalize(join(fileURLToPath(root), ".."));
-  const packageJson = join(cwd, "./package.json");
-  const pkg = JSON.parse(readFileSync(packageJson, { encoding: "utf8" }));
-  return pkg.version;
+  try {
+    const cwd = normalize(join(fileURLToPath(root), ".."));
+    const packageJson = join(cwd, "./package.json");
+    const pkg = JSON.parse(readFileSync(packageJson, { encoding: "utf8" }));
+    return pkg.version;
+  } catch (_) {
+    return "unknown";
+  }
 }
 
 export function getRevision(root: /* ImportMeta.URL */ string) {

core/src/actions/prompt_thread.ts

@@ -192,12 +192,12 @@ async function generateOne(
     messages: meta?.messages
       ?.map((m) => ({
         role: m.role,
-        content: m.content.replaceAll("\n", " ").substring(0, 150) + "...",
+        content: m.content.replace(/\n/g, " ").substring(0, 150) + "...",
         // tokens: m.tokens,
       }))
       // Skip the last `assistant` message
       .filter((m, i, a) => !(m.role == "assistant" && i === a.length - 1))
-      .map(({ role, content }) => `${role}: ${content.replaceAll("\n", "\\n")}`)
+      .map(({ role, content }) => `${role}: ${content.replace(/\n/g, "\\n")}`)
       .join("\n\t"),
   });
   const generated = await engine.generate(c, settings);

core/src/engine/bedrock/bedrock.ts

@@ -40,6 +40,18 @@ export async function generate(
   if (c.context.edit) {
     const lang = c.context.edit.file.split(".").at(-1) ?? "";
     fence = "```" + lang;
+    const { start, end } = c.context.edit as { start?: number; end?: number };
+    if (start != undefined) {
+      if (messages.at(-1)?.role === "user") {
+        messages.at(-1)!.content += [
+          "",
+          "You are replacing this section:",
+          "```",
+          c.meta?.text?.split("\n").slice(start, end),
+          "```",
+        ].join("\n");
+      }
+    }
     messages.push({ role: "assistant", content: fence });
     stopSequences = ["```"];
   }
@@ -176,7 +188,7 @@ export function getMessagesFolder(
     (content.context.folder ?? [])
       .map((c) => context[c])
       .map<string>(
-        (c) => `<file name="${c.name}>\n${c.prompt ?? c.response ?? ""}</file>`
+        (c) => `<file name="${c.name}>\n${c.meta?.text ?? c.prompt + "\n" + c.response}</file>`
       )
       .join("\n") +
     "\n</folder>";

core/src/engine/index.ts

@@ -15,6 +15,7 @@ export interface Engine {
   ): Promise<{ debug: D; message: string }>;
   vector(s: string, parameters: ContentMeta): Promise<number[]>;
   view?(): Promise<View>;
+  models?(): string[];
 }
 
 export interface Message {

core/src/engine/mistral/mistral.ts

@@ -16,9 +16,10 @@ export async function generate(
     }
 
     let cwd = dirname(
-      import.meta.url
-        .replace(/^file:/, "")
-        .replace("ailly/core/dist", "ailly/core/src")
+      (import.meta?.url.replace(/^file:/, "") ?? __filename).replace(
+        "ailly/core/dist",
+        "ailly/core/src"
+      )
     );
     let command = join(cwd, normalize(".venv/bin/python3"));
     let args = [join(cwd, "mistral.py"), prompt];
@@ -35,7 +36,7 @@ export async function generate(
     child.on("disconnect", done);
 
     const error = (cause: unknown) =>
-      reject(new Error("child_process had a problem", { cause }));
+      reject(new Error("child_process had a problem" /*, { cause }*/));
     child.on("error", error);
   });
 }

core/src/engine/noop.ts

@@ -1,8 +1,8 @@
 import { getLogger } from "@davidsouther/jiffies/lib/esm/log.js";
 import { Content } from "../content/content.js";
 import { LOGGER as ROOT_LOGGER } from "../util.js";
-import type { PipelineSettings } from "../ailly";
-import type { Message } from "./index";
+import type { PipelineSettings } from "../ailly.js";
+import type { Message } from "./index.js";
 
 const LOGGER = getLogger("@ailly/core:noop");
 

core/src/engine/openai.ts

@@ -1,8 +1,8 @@
 import { OpenAI, toFile } from "openai";
 import { assertExists } from "@davidsouther/jiffies/lib/esm/assert.js";
-import type { Content } from "../content/content";
-import type { PipelineSettings } from "../ailly";
-import type { Message, Summary } from "./index";
+import type { Content } from "../content/content.js";
+import type { PipelineSettings } from "../ailly.js";
+import type { Message, Summary } from "./index.js";
 import { LOGGER, isDefined } from "../util.js";
 import { encode } from "../encoding.js";
 
@@ -85,7 +85,7 @@ async function callOpenAiWithRateLimit(
     } catch (e: any) {
       LOGGER.warn("Error calling openai", e.message);
       if (retry == 0) {
-        throw new Error("Failed 3 times to call openai", { cause: e });
+        throw new Error("Failed 3 times to call openai" /*, { cause: e }*/);
       }
       if (e.error.code == "rate_limit_exceeded") {
         await new Promise((resolve) => {

extension/package.json

@@ -5,7 +5,7 @@
   "author": "David Souther <[email protected]>",
   "contributors": [],
   "repository": "https://github.com/davidsouther/ailly",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "engines": {
     "vscode": "^1.83.0"
   },
@@ -22,6 +22,10 @@
       {
         "command": "ailly.generate",
         "title": "Ailly: Generate"
+      },
+      {
+        "command": "ailly.edit",
+        "title": "Ailly: Edit"
       }
     ],
     "menus": {
@@ -36,6 +40,40 @@
       {
         "title": "Ailly",
         "properties": {
+          "ailly.engine": {
+            "type": "string",
+            "default": "bedrock",
+            "enum": [
+              "bedrock",
+              "openai"
+            ],
+            "description": "The Ailly engine to use when making LLM calls."
+          },
+          "ailly.model": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "default": "haiku",
+            "description": "The default model to use when making LLM calls."
+          },
+          "ailly.log-level": {
+            "type": "string",
+            "default": "info",
+            "enum": [
+              "debug",
+              "info",
+              "warn",
+              "error",
+              "silent"
+            ],
+            "description": "The log level to record Ailly details."
+          },
+          "ailly.log-pretty": {
+            "type": "boolean",
+            "default": false,
+            "description": "JSON (false) or pretty print (true) logs."
+          },
           "ailly.openai-api-key": {
             "type": [
               "string",
@@ -50,15 +88,17 @@
   },
   "scripts": {
     "vscode:prepublish": "npm run esbuild-base -- --minify",
-    "esbuild-base": "esbuild ./src/extension.cts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
+    "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
     "esbuild": "npm run esbuild-base -- --sourcemap",
     "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch",
     "test-compile": "tsc -p ./",
     "compile": "tsc -p ./",
+    "build": "esbuild",
     "watch": "tsc -watch -p ./",
     "pretest": "npm run compile && npm run lint",
     "lint": "eslint src --ext ts",
     "test": "node ./out/test/runTest.js",
+    "prepackage": "npm run vscode:prepublish",
     "package": "vsce package"
   },
   "devDependencies": {