tryharness 0.7.28 → 0.7.29

package/lib/daemon.mjs

@@ -228,6 +228,14 @@ function daemonAnswers(socketPath) {
 
 export async function startDaemon() {
   ensureDir(paths.home);
+  // Started by the Harness app's launcher (HarnessDaemon.swift): if it goes, this goes too, so the daemon launchd starts
+  // next is the only one. The agents this daemon starts do not inherit the mark.
+  const launcher = Number(process.env.HARNESS_LAUNCHER_PID);
+  delete process.env.HARNESS_LAUNCHER_PID;
+  if (launcher)
+    setInterval(() => {
+      if (process.ppid !== launcher) process.exit(0);
+    }, 5_000).unref();
   const config = readJson(paths.config, {});
   if (!config.origin || !config.token)
     throw new Error("Harness is not paired. Run: npx tryharness");
@@ -2730,15 +2738,18 @@ export async function startDaemon() {
   // needed, a context pack for each local agent's brief, and the overnight learner. The firewall (firewall.mjs) reads what
   // agents hand each other and scrubs what leaves for a hosted agent. Both need the core local models; without them
   // briefs and handoffs go as they did before.
-  // Folders of recordings and screenshots the person added (tryharness local add), searched by the media part of the
-  // search model; it downloads (555 MB) the first time a folder is added.
-  const mediaFolders = () => {
-    const listed = readJson(paths.config, {}).localFolders;
-    return Array.isArray(listed)
-      ? listed.filter(
-          (folder) => typeof folder === "string" && fs.existsSync(folder)
-        )
-      : [];
+  // The folders searched by what is in their files (library.mjs): where people keep their own files, unless the person
+  // turned search off (tryharness local off), and any they added (tryharness local add). Documents and PDFs need only
+  // the search model; pictures, recordings and video wait for its image and audio part, which comes down on the charger.
+  const OWN_FOLDERS = ["Desktop", "Documents", "Downloads"];
+  const libraryFolders = () => {
+    const config = readJson(paths.config, {});
+    if (config.libraryOff === true) return [];
+    const added = Array.isArray(config.localFolders) ? config.localFolders : [];
+    const own = OWN_FOLDERS.map((name) => path.join(os.homedir(), name));
+    return [...new Set([...own, ...added])].filter(
+      (folder) => typeof folder === "string" && fs.existsSync(folder)
+    );
   };
   let mediaDownload = null;
   const fetchMedia = () => {
@@ -2758,13 +2769,85 @@ export async function startDaemon() {
       });
     return mediaDownload;
   };
+  const ocr = createOcr({ inference });
+  // A library hit as an agent on this computer reads it: a path it can open, and where in the file.
+  const localHit = ({ vec, file, thread, ...hit }) => {
+    const stored = thread ? store.file(file) : null;
+    return {
+      ...hit,
+      path: stored ? namedPath(stored) : file,
+      ...(thread ? { thread, fileId: file } : {}),
+    };
+  };
+  // The thread's own files closest to a question, beside its written context. A caller through Harness finds only the
+  // files shared with cloud agents, by id (get_file opens them); an agent here gets the path too.
+  const threadFileHits = async (task, query, hostedCaller) => {
+    if (!localReady(["search"]) || !query.trim()) return [];
+    const thread = roomOf(task)?.id ?? task.id;
+    const readable = (fileId) => {
+      const file = store.file(fileId);
+      return Boolean(file) && (!hostedCaller || file.cloud);
+    };
+    try {
+      const hits = await contextEngine.searchFiles(query, {
+        threads: [thread],
+        allow: readable,
+        limit: 5,
+      });
+      return hits.map((hit) =>
+        hostedCaller
+          ? {
+              fileId: hit.file,
+              name: hit.name,
+              place: hit.place,
+              // A picture's text could name what its covered copy hides: get_file opens the covered picture.
+              excerpt: hit.modality === "image" ? null : hit.excerpt,
+              score: hit.score,
+            }
+          : localHit(hit)
+      );
+    } catch (error) {
+      log(`thread files search: ${error.message}`);
+      return [];
+    }
+  };
+  // Every file the threads hold, for the library: read from its stored copy under its own name.
+  const libraryThreadFiles = () =>
+    store.presentFiles().map((file) => ({
+      id: file.id,
+      thread: roomOf(store.getTask(file.task_id))?.id ?? file.task_id,
+      name: file.name,
+      sha256: file.sha256,
+      path: namedPath(file),
+    }));
+  // A thread file is read soon after it arrives; several arriving together are read in one pass.
+  let filesSoon = null;
+  const readFilesSoon = () => {
+    clearTimeout(filesSoon);
+    filesSoon = setTimeout(() => {
+      if (localReady(["search"]))
+        void contextEngine.refreshFiles().catch(() => {});
+    }, 2_000);
+    filesSoon.unref?.();
+  };
   const contextEngine = createContextEngine({
     store,
     inference,
     home: localRoot,
     known: () => folders.known(),
-    mediaFolders,
+    libraryFolders,
+    threadFiles: () => libraryThreadFiles(),
     mediaReady: () => localReady(["search", "media"]),
+    // Pictures and sound waiting: the image and audio part comes down on the charger, then they are read.
+    wantMedia: () => {
+      if (!inference.power.onCharger() || inference.power.paused()) return;
+      void fetchMedia()
+        .then(() => contextEngine.refreshFiles())
+        .catch(() => {});
+    },
+    ocr,
+    mask: async (text) =>
+      (await firewall.scrub(text, { lane: "interactive" })).text,
     log,
     notify: (text) => {
       if (notificationsOn()) notifyDesktop(text);
@@ -2779,7 +2862,6 @@ export async function startDaemon() {
   // original's hash, so another read costs nothing, and the task says what was hidden from whom. Until both models are
   // here no image leaves: the read is refused and they come down now. An image that cannot be checked (not PNG or
   // JPEG, animated, broken) never leaves.
-  const ocr = createOcr({ inference });
   const REDACT_MODELS = ["ocr", "credentials"];
   let redactModels = null;
   const redacting = new Map();
@@ -3275,6 +3357,38 @@ export async function startDaemon() {
             error: "the relay's local search is not downloaded yet",
           }),
     scrub: (text) => firewall.scrub(text),
+    files: {
+      search: (words) =>
+        localReady(["search"])
+          ? contextEngine.searchFiles(words, { folders: true, limit: 1 })
+          : Promise.resolve([]),
+      content: (file, vec) => contextEngine.fileContent(file, vec),
+      transcribe: async (audio) =>
+        (await speech.transcribe(audio, { lane: "handoff" })).text || null,
+      cover: (bytes) =>
+        redactImage({ bytes, mime: "image/png" }, { ocr, firewall }),
+      keep: keepBlob,
+      attach: ({ threadId, sha256, name, mime }) => {
+        const file = store.addFile({
+          taskId: threadId,
+          name: fileName(name),
+          mime,
+          bytes: fs.statSync(blobPath(sha256)).size,
+          sha256,
+          author: "harness",
+          cloud: true,
+        });
+        store.addContribution({
+          taskId: threadId,
+          kind: "file",
+          author: "harness",
+          text: `harness attached ${fileLine(file)}`,
+          source: `file:${file.id}`,
+        });
+        readFilesSoon();
+        return file;
+      },
+    },
     wake: (goalId, post, names) => wakeFor(goalId, post, "harness", names),
     notify: (text) => {
       localEvent("snippet", text);
@@ -4292,6 +4406,7 @@ export async function startDaemon() {
           threadId: thread.id,
           agent,
           about: request.about,
+          where: ["code", "files"].includes(request.in) ? request.in : null,
         }),
       };
     }
@@ -4305,26 +4420,39 @@ export async function startDaemon() {
         ? { ok: true, snippets: snippets.list({ all: request.all === true }) }
         : snippets.decide(String(request.id || ""), request.share === true);
     }
-    // Recordings and screenshots in folders the person added, for agents on this computer only.
-    if (request.command === "board.media.search") {
+    // The person's files and a thread's files, by what is in them, for agents on this computer only (library.mjs).
+    // board.media.search is the name the tool had before documents and thread files were added.
+    if (
+      request.command === "board.files.search" ||
+      request.command === "board.media.search"
+    ) {
       if (request.hostedCaller)
         return {
           ok: false,
-          error: "searching recordings runs only for agents on this computer",
+          error:
+            "searching the person's files runs only for agents on this computer",
         };
-      if (!localReady(["search", "media"]) || !mediaFolders().length)
+      if (!localReady(["search"]))
+        return { ok: false, error: "the local search model is not ready yet" };
+      const thread = request.thread
+        ? store.getTask(String(request.thread))
+        : null;
+      const threadId = thread ? (roomOf(thread)?.id ?? thread.id) : null;
+      if (!libraryFolders().length && !threadId)
         return {
           ok: false,
           error:
-            "no folders of recordings or screenshots are added yet: the person adds one with npx tryharness local add <folder>",
+            "no folders are added yet (the person adds one with npx tryharness local add <folder>); give a thread to search its files",
         };
       return {
         ok: true,
         pending: contextEngine
-          .searchMedia(String(request.query || "").slice(0, 2_000), {
+          .searchFiles(String(request.query || "").slice(0, 2_000), {
+            folders: true,
+            threads: threadId ? [threadId] : [],
             limit: Math.min(20, Number(request.limit) || 8),
           })
-          .then((hits) => ({ ok: true, hits })),
+          .then((hits) => ({ ok: true, hits: hits.map(localHit) })),
       };
     }
     // What the person saw in the tabs they share with Harness, asked of their own Harness window sealed (phones.mjs ask),
@@ -4812,14 +4940,22 @@ export async function startDaemon() {
         ? { ok: true, entry, context: store.contextCount(id) }
         : { ok: false, error: "nothing to add" };
     } else if (request.command === "board.context.search") {
-      if (!store.getTask(id)) return { ok: false, error: "task not found" };
+      const task = store.getTask(id);
+      if (!task) return { ok: false, error: "task not found" };
+      const query = String(request.query || "");
+      const k = Math.max(
+        1,
+        Math.min(20, Number(request.limit ?? request.k) || 8)
+      );
       return {
         ok: true,
-        pending: searchContext(
-          id,
-          String(request.query || ""),
-          Math.max(1, Math.min(20, Number(request.limit) || 8))
-        ),
+        pending: Promise.all([
+          searchContext(id, query, k),
+          threadFileHits(task, query, request.hostedCaller === true),
+        ]).then(([found, files]) => ({
+          ...found,
+          ...(files.length ? { files } : {}),
+        })),
       };
     } else if (request.command === "board.thread.read") {
       const thread = store.getThread(id);
@@ -5078,6 +5214,7 @@ export async function startDaemon() {
         source: `file:${file.id}`,
       });
       notifyBoard(store.getTask(place));
+      readFilesSoon();
       return { ok: true, file: fileView(file, request.hostedCaller) };
     } else if (request.command === "board.file.share") {
       // Whether the agents on Harness's side may read a file: the person's call, either way, on any file. A call through
@@ -5528,6 +5665,11 @@ export async function startDaemon() {
           ? await contextEngine.pack({
               brief: request,
               folder: task.run_workspace,
+              thread: wake
+                ? task.parent_id
+                : room?.kind === "goal"
+                  ? room.id
+                  : null,
             })
           : null;
       const entry =
@@ -6298,6 +6440,7 @@ export async function startDaemon() {
     if (
       command === "board.code.search" ||
       command === "board.media.search" ||
+      command === "board.files.search" ||
       command === "board.screens.compare" ||
       command === "board.video.watch" ||
       command === "board.audio.listen" ||
@@ -6428,6 +6571,18 @@ export async function startDaemon() {
           .catch((error) => log(`context engine: ${error.message}`));
         reply({ ok: true, started: true });
       }
+      // Search over the person's folders, on (the default) or off; off forgets what was read from them.
+      else if (
+        request.command === "local.on" ||
+        request.command === "local.off"
+      ) {
+        writeJsonAtomic(paths.config, {
+          ...readJson(paths.config, {}),
+          libraryOff: request.command === "local.off",
+        });
+        reply({ ok: true, folders: libraryFolders() });
+        setImmediate(() => void contextEngine.refreshFiles().catch(() => {}));
+      }
       // A folder of recordings and screenshots the person adds or takes away (no picker: they name it). Adding one starts
       // the media part's download, then reads the folder on the background lane.
       else if (
@@ -6458,19 +6613,23 @@ export async function startDaemon() {
           localFolders:
             request.command === "local.add" ? [...listed, folder] : listed,
         });
-        if (request.command === "local.add")
-          void fetchMedia()
-            .then(() => contextEngine.refreshMedia())
-            .then(
-              (done) =>
+        if (request.command === "local.add") {
+          const read = () =>
+            contextEngine
+              .refreshFiles()
+              .then((done) =>
                 log(
-                  `media: ${done.added} of ${done.files} files read in the added folders`
-                ),
-              () => {}
-            );
+                  `library: ${done.added} of ${done.files} files read in the added folders`
+                )
+              );
+          void read()
+            .then(() => fetchMedia())
+            .then(read)
+            .catch(() => {});
+        }
         reply({
           ok: true,
-          folders: mediaFolders(),
+          folders: libraryFolders(),
           downloading:
             request.command === "local.add" && !localReady(["media"]),
         });

package/lib/desktop.mjs

@@ -165,6 +165,26 @@ export function desktopTarget({
   return path.join(paths.home, "desktop", file);
 }
 
+/** A program inside the installed Harness app on a Mac (its helpers), or null where there is none. */
+export function appProgram(
+  name,
+  {
+    env = process.env,
+    platform = process.platform,
+    homeDir = os.homedir(),
+  } = {}
+) {
+  if (platform !== "darwin") return null;
+  const app = desktopTarget({
+    source: { app: "Harness.app" },
+    env,
+    platform,
+    homeDir,
+  });
+  const file = path.join(app, "Contents", "MacOS", name);
+  return fs.existsSync(file) ? file : null;
+}
+
 function executables(target, platform) {
   if (platform === "darwin") {
     const dir = path.join(target, "Contents", "MacOS");
@@ -184,7 +204,10 @@ export function quitDesktop({
     execute("taskkill", ["/F", "/IM", path.basename(target)]);
     return;
   }
-  const exes = executables(target, platform);
+  // The daemon's launcher keeps running through an update: its next start is the new one.
+  const exes = executables(target, platform).filter(
+    (exe) => path.basename(exe) !== "HarnessDaemon"
+  );
   for (const exe of exes) execute("pkill", ["-f", exe]);
   // Opening it again before the old one has gone fails on macOS (LaunchServices error -600).
   for (