@monotykamary/localterm-server 2.66.17 → 2.66.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. package/dist/agent-runner.d.ts.map +1 -1
  2. package/dist/agent-runner.js +40 -13
  3. package/dist/agent-runner.js.map +1 -1
  4. package/dist/agent-session-reader.d.ts.map +1 -1
  5. package/dist/agent-session-reader.js +122 -91
  6. package/dist/agent-session-reader.js.map +1 -1
  7. package/dist/agent-skills.d.ts.map +1 -1
  8. package/dist/agent-skills.js +12 -2
  9. package/dist/agent-skills.js.map +1 -1
  10. package/dist/constants.d.ts +25 -0
  11. package/dist/constants.d.ts.map +1 -1
  12. package/dist/constants.js +25 -0
  13. package/dist/constants.js.map +1 -1
  14. package/dist/git-diff-cache.d.ts +1 -0
  15. package/dist/git-diff-cache.d.ts.map +1 -1
  16. package/dist/git-diff-cache.js +31 -1
  17. package/dist/git-diff-cache.js.map +1 -1
  18. package/dist/git-diff-service.d.ts.map +1 -1
  19. package/dist/git-diff-service.js +72 -37
  20. package/dist/git-diff-service.js.map +1 -1
  21. package/dist/git-diff-watcher.d.ts.map +1 -1
  22. package/dist/git-diff-watcher.js +26 -16
  23. package/dist/git-diff-watcher.js.map +1 -1
  24. package/dist/github-pr.d.ts.map +1 -1
  25. package/dist/github-pr.js +26 -1
  26. package/dist/github-pr.js.map +1 -1
  27. package/dist/protocol.d.ts +1 -1
  28. package/dist/protocol.d.ts.map +1 -1
  29. package/dist/protocol.js +1 -1
  30. package/dist/protocol.js.map +1 -1
  31. package/dist/session-client-hub.d.ts +1 -0
  32. package/dist/session-client-hub.d.ts.map +1 -1
  33. package/dist/session-client-hub.js +17 -2
  34. package/dist/session-client-hub.js.map +1 -1
  35. package/dist/session-git-event-bridge.d.ts +4 -2
  36. package/dist/session-git-event-bridge.d.ts.map +1 -1
  37. package/dist/session-git-event-bridge.js +68 -25
  38. package/dist/session-git-event-bridge.js.map +1 -1
  39. package/dist/session-manager.d.ts +2 -2
  40. package/dist/session-manager.d.ts.map +1 -1
  41. package/dist/session-manager.js +0 -3
  42. package/dist/session-manager.js.map +1 -1
  43. package/dist/session-output-coordinator.d.ts +1 -0
  44. package/dist/session-output-coordinator.d.ts.map +1 -1
  45. package/dist/session-output-coordinator.js +5 -2
  46. package/dist/session-output-coordinator.js.map +1 -1
  47. package/dist/session-output-transport.d.ts +2 -0
  48. package/dist/session-output-transport.d.ts.map +1 -1
  49. package/dist/session-output-transport.js +103 -26
  50. package/dist/session-output-transport.js.map +1 -1
  51. package/dist/utils/append-bounded-buffer-text.d.ts +7 -0
  52. package/dist/utils/append-bounded-buffer-text.d.ts.map +1 -0
  53. package/dist/utils/append-bounded-buffer-text.js +12 -0
  54. package/dist/utils/append-bounded-buffer-text.js.map +1 -0
  55. package/dist/utils/read-bounded-lines.d.ts +6 -0
  56. package/dist/utils/read-bounded-lines.d.ts.map +1 -0
  57. package/dist/utils/read-bounded-lines.js +46 -0
  58. package/dist/utils/read-bounded-lines.js.map +1 -0
  59. package/dist/utils/resolve-github-token.d.ts.map +1 -1
  60. package/dist/utils/resolve-github-token.js +27 -8
  61. package/dist/utils/resolve-github-token.js.map +1 -1
  62. package/dist/utils/run-git.d.ts +7 -1
  63. package/dist/utils/run-git.d.ts.map +1 -1
  64. package/dist/utils/run-git.js +52 -18
  65. package/dist/utils/run-git.js.map +1 -1
  66. package/package.json +1 -1
@@ -3,6 +3,7 @@ import fs from "node:fs";
3
3
  import os from "node:os";
4
4
  import path from "node:path";
5
5
  import { promisify } from "node:util";
6
+ import { GITHUB_HOSTS_FILE_MAX_BYTES, GITHUB_TOKEN_CACHE_MAX_ENTRIES, GITHUB_TOKEN_CACHE_TTL_MS, } from "../constants.js";
6
7
  const execFileAsync = promisify(execFile);
7
8
  const KEYRING_SERVICE_PREFIX = "gh:";
8
9
  const readKeychainToken = async (hostname) => {
@@ -47,7 +48,10 @@ const readKeychainToken = async (hostname) => {
47
48
  const isPlainToken = (value) => /^(gh[ps]_|github_pat_)/.test(value) || /^[a-f0-9]{40}$/.test(value);
48
49
  const readHostsYmlToken = (hostname) => {
49
50
  try {
50
- const content = fs.readFileSync(path.join(os.homedir(), ".config", "gh", "hosts.yml"), "utf8");
51
+ const hostsFile = path.join(os.homedir(), ".config", "gh", "hosts.yml");
52
+ if (fs.statSync(hostsFile).size > GITHUB_HOSTS_FILE_MAX_BYTES)
53
+ return null;
54
+ const content = fs.readFileSync(hostsFile, "utf8");
51
55
  const tokenPattern = new RegExp(`^${hostname.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}:\\s*[\\s\\S]*?oauth_token:\\s*["']?([^"':\\s]+)`, "m");
52
56
  const match = tokenPattern.exec(content);
53
57
  const token = match?.[1];
@@ -57,24 +61,39 @@ const readHostsYmlToken = (hostname) => {
57
61
  return null;
58
62
  }
59
63
  };
60
- const KEYCHAIN_CACHE_TTL_MS = 5 * 60 * 1000;
61
64
  const keychainCache = new Map();
65
+ const cacheToken = (hostname, token) => {
66
+ keychainCache.delete(hostname);
67
+ keychainCache.set(hostname, {
68
+ token,
69
+ expiresAt: Date.now() + GITHUB_TOKEN_CACHE_TTL_MS,
70
+ });
71
+ while (keychainCache.size > GITHUB_TOKEN_CACHE_MAX_ENTRIES) {
72
+ const oldestHostname = keychainCache.keys().next().value;
73
+ if (oldestHostname === undefined)
74
+ break;
75
+ keychainCache.delete(oldestHostname);
76
+ }
77
+ };
62
78
  export const resolveGithubToken = async (hostname = "github.com") => {
63
79
  const envToken = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
64
80
  if (envToken && isPlainToken(envToken))
65
81
  return envToken;
66
82
  const cached = keychainCache.get(hostname);
67
- if (cached && cached.expiresAt > Date.now())
83
+ if (cached && cached.expiresAt > Date.now()) {
84
+ keychainCache.delete(hostname);
85
+ keychainCache.set(hostname, cached);
68
86
  return cached.token;
87
+ }
88
+ keychainCache.delete(hostname);
69
89
  const fileToken = readHostsYmlToken(hostname);
70
- if (fileToken)
90
+ if (fileToken) {
91
+ cacheToken(hostname, fileToken);
71
92
  return fileToken;
93
+ }
72
94
  const keychainToken = await readKeychainToken(hostname);
73
95
  if (keychainToken) {
74
- keychainCache.set(hostname, {
75
- token: keychainToken,
76
- expiresAt: Date.now() + KEYCHAIN_CACHE_TTL_MS,
77
- });
96
+ cacheToken(hostname, keychainToken);
78
97
  return keychainToken;
79
98
  }
80
99
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"resolve-github-token.js","sourceRoot":"","sources":["../../src/utils/resolve-github-token.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resolve-github-token.js","sourceRoot":"","sources":["../../src/utils/resolve-github-token.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,13 @@
1
+ export interface RunGitOptions {
2
+ maxStdoutBytes?: number;
3
+ maxStderrBytes?: number;
4
+ }
1
5
  export interface RunGitResult {
2
6
  exitCode: number;
3
7
  stdout: Buffer;
4
8
  stderr: string;
9
+ stdoutTruncated?: boolean;
10
+ stderrTruncated?: boolean;
5
11
  }
6
- export declare const runGit: (cwd: string, args: string[]) => Promise<RunGitResult>;
12
+ export declare const runGit: (cwd: string, args: string[], options?: RunGitOptions) => Promise<RunGitResult>;
7
13
  //# sourceMappingURL=run-git.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"run-git.d.ts","sourceRoot":"","sources":["../../src/utils/run-git.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAeD,eAAO,MAAM,MAAM,QAAS,MAAM,QAAQ,MAAM,EAAE,KAAG,OAAO,CAAC,YAAY,CA+BrE,CAAC"}
1
+ {"version":3,"file":"run-git.d.ts","sourceRoot":"","sources":["../../src/utils/run-git.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,aAAa;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAQD,eAAO,MAAM,MAAM,QACZ,MAAM,QACL,MAAM,EAAE,YACL,aAAa,KACrB,OAAO,CAAC,YAAY,CA6EnB,CAAC"}
@@ -1,45 +1,79 @@
1
1
  import { spawn } from "node:child_process";
2
- import { GIT_SPAWN_TIMEOUT_MS } from "../constants.js";
2
+ import { GIT_SPAWN_MAX_STDERR_BYTES, GIT_SPAWN_MAX_STDOUT_BYTES, GIT_SPAWN_TIMEOUT_MS, } from "../constants.js";
3
3
  import { resolveGitBinary } from "./resolve-git-binary.js";
4
- // GIT_PAGER="" stops git from invoking a pager; GIT_TERMINAL_PROMPT=0 stops it
5
- // from blocking on a credential prompt (a missing token would otherwise hang
6
- // the spawn — and thus the daemon's event loop — for good).
7
4
  const GIT_ENV = {
8
5
  ...process.env,
9
6
  GIT_PAGER: "",
10
7
  GIT_TERMINAL_PROMPT: "0",
11
8
  };
12
- // Never throws: a non-zero exit (e.g. `rev-parse --verify` on a missing ref) and
13
- // a missing git binary both surface as { exitCode } for the caller to decide on.
14
- // stdout is captured as a Buffer so binary-ish patch output survives intact;
15
- // callers decode with toString("utf8") where they know it's text.
16
- export const runGit = (cwd, args) => new Promise((resolve) => {
9
+ export const runGit = (cwd, args, options = {}) => new Promise((resolve) => {
17
10
  const child = spawn(resolveGitBinary(), args, { cwd, env: GIT_ENV });
11
+ const maxStdoutBytes = Math.max(1, Math.floor(options.maxStdoutBytes ?? GIT_SPAWN_MAX_STDOUT_BYTES));
12
+ const maxStderrBytes = Math.max(1, Math.floor(options.maxStderrBytes ?? GIT_SPAWN_MAX_STDERR_BYTES));
18
13
  const stdoutChunks = [];
19
- let stderrText = "";
14
+ const stderrChunks = [];
15
+ let stdoutBytes = 0;
16
+ let stderrBytes = 0;
17
+ let stdoutTruncated = false;
18
+ let stderrTruncated = false;
20
19
  let settled = false;
21
- const finish = (result) => {
20
+ let timeout;
21
+ const finish = (exitCode, fallbackError) => {
22
22
  if (settled)
23
23
  return;
24
24
  settled = true;
25
25
  clearTimeout(timeout);
26
- resolve(result);
26
+ const capturedStderr = Buffer.concat(stderrChunks, stderrBytes).toString("utf8");
27
+ resolve({
28
+ exitCode,
29
+ stdout: Buffer.concat(stdoutChunks, stdoutBytes),
30
+ stderr: fallbackError ?? capturedStderr,
31
+ ...(stdoutTruncated ? { stdoutTruncated: true } : {}),
32
+ ...(stderrTruncated ? { stderrTruncated: true } : {}),
33
+ });
27
34
  };
28
- const timeout = setTimeout(() => {
35
+ const stopForCaptureLimit = () => {
29
36
  child.kill("SIGKILL");
30
- finish({ exitCode: -1, stdout: Buffer.concat(stdoutChunks), stderr: "git timed out" });
37
+ const streamName = stdoutTruncated ? "stdout" : "stderr";
38
+ finish(-1, `git ${streamName} exceeded its capture limit`);
39
+ };
40
+ timeout = setTimeout(() => {
41
+ child.kill("SIGKILL");
42
+ finish(-1, "git timed out");
31
43
  }, GIT_SPAWN_TIMEOUT_MS);
32
44
  child.stdout.on("data", (chunk) => {
33
- stdoutChunks.push(chunk);
45
+ if (settled)
46
+ return;
47
+ const remainingBytes = maxStdoutBytes - stdoutBytes;
48
+ if (remainingBytes > 0) {
49
+ const captured = chunk.subarray(0, remainingBytes);
50
+ stdoutChunks.push(captured);
51
+ stdoutBytes += captured.length;
52
+ }
53
+ if (chunk.length > remainingBytes) {
54
+ stdoutTruncated = true;
55
+ stopForCaptureLimit();
56
+ }
34
57
  });
35
58
  child.stderr.on("data", (chunk) => {
36
- stderrText += chunk.toString("utf8");
59
+ if (settled)
60
+ return;
61
+ const remainingBytes = maxStderrBytes - stderrBytes;
62
+ if (remainingBytes > 0) {
63
+ const captured = chunk.subarray(0, remainingBytes);
64
+ stderrChunks.push(captured);
65
+ stderrBytes += captured.length;
66
+ }
67
+ if (chunk.length > remainingBytes) {
68
+ stderrTruncated = true;
69
+ stopForCaptureLimit();
70
+ }
37
71
  });
38
72
  child.on("error", () => {
39
- finish({ exitCode: -1, stdout: Buffer.concat(stdoutChunks), stderr: "git not installed" });
73
+ finish(-1, "git not installed");
40
74
  });
41
75
  child.on("close", (code) => {
42
- finish({ exitCode: code ?? -1, stdout: Buffer.concat(stdoutChunks), stderr: stderrText });
76
+ finish(code ?? -1);
43
77
  });
44
78
  });
45
79
  //# sourceMappingURL=run-git.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"run-git.js","sourceRoot":"","sources":["../../src/utils/run-git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAQ3D,+EAA+E;AAC/E,6EAA6E;AAC7E,4DAA4D;AAC5D,MAAM,OAAO,GAAG;IACd,GAAG,OAAO,CAAC,GAAG;IACd,SAAS,EAAE,EAAE;IACb,mBAAmB,EAAE,GAAG;CACzB,CAAC;AAEF,iFAAiF;AACjF,iFAAiF;AACjF,6EAA6E;AAC7E,kEAAkE;AAClE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,IAAc,EAAyB,EAAE,CAC3E,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;IACtB,MAAM,KAAK,GAAG,KAAK,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACrE,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,MAAM,MAAM,GAAG,CAAC,MAAoB,EAAQ,EAAE;QAC5C,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,GAAG,IAAI,CAAC;QACf,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC9B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtB,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACzF,CAAC,EAAE,oBAAoB,CAAC,CAAC;IAEzB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;QACxC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;QACxC,UAAU,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACrB,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAC7F,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QACzB,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAC5F,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"run-git.js","sourceRoot":"","sources":["../../src/utils/run-git.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@monotykamary/localterm-server",
3
- "version": "2.66.17",
3
+ "version": "2.66.19",
4
4
  "description": "PTY-backed HTTP/WebSocket server that powers localterm, built on Hono + node-pty.",
5
5
  "keywords": [
6
6
  "hono",