Merge d371932b28 into 09be5d45d5
This commit is contained in:
commit
97d8c8c3df
20
.github/workflows/ci.yml
vendored
20
.github/workflows/ci.yml
vendored
@ -16,6 +16,10 @@ jobs:
|
|||||||
- name: Checkout submodules (retry)
|
- name: Checkout submodules (retry)
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
if [ ! -f .gitmodules ]; then
|
||||||
|
echo "No .gitmodules found; skipping submodule update."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
git submodule sync --recursive
|
git submodule sync --recursive
|
||||||
for attempt in 1 2 3 4 5; do
|
for attempt in 1 2 3 4 5; do
|
||||||
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
||||||
@ -101,6 +105,10 @@ jobs:
|
|||||||
- name: Checkout submodules (retry)
|
- name: Checkout submodules (retry)
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
if [ ! -f .gitmodules ]; then
|
||||||
|
echo "No .gitmodules found; skipping submodule update."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
git submodule sync --recursive
|
git submodule sync --recursive
|
||||||
for attempt in 1 2 3 4 5; do
|
for attempt in 1 2 3 4 5; do
|
||||||
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
||||||
@ -217,6 +225,10 @@ jobs:
|
|||||||
- name: Checkout submodules (retry)
|
- name: Checkout submodules (retry)
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
if [ ! -f .gitmodules ]; then
|
||||||
|
echo "No .gitmodules found; skipping submodule update."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
git submodule sync --recursive
|
git submodule sync --recursive
|
||||||
for attempt in 1 2 3 4 5; do
|
for attempt in 1 2 3 4 5; do
|
||||||
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
||||||
@ -293,6 +305,10 @@ jobs:
|
|||||||
- name: Checkout submodules (retry)
|
- name: Checkout submodules (retry)
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
if [ ! -f .gitmodules ]; then
|
||||||
|
echo "No .gitmodules found; skipping submodule update."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
git submodule sync --recursive
|
git submodule sync --recursive
|
||||||
for attempt in 1 2 3 4 5; do
|
for attempt in 1 2 3 4 5; do
|
||||||
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
||||||
@ -389,6 +405,10 @@ jobs:
|
|||||||
- name: Checkout submodules (retry)
|
- name: Checkout submodules (retry)
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
if [ ! -f .gitmodules ]; then
|
||||||
|
echo "No .gitmodules found; skipping submodule update."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
git submodule sync --recursive
|
git submodule sync --recursive
|
||||||
for attempt in 1 2 3 4 5; do
|
for attempt in 1 2 3 4 5; do
|
||||||
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
|
||||||
|
|||||||
@ -422,11 +422,10 @@ final class AppState {
|
|||||||
let trimmedUser = parsed.user?.trimmingCharacters(in: .whitespacesAndNewlines)
|
let trimmedUser = parsed.user?.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
let user = (trimmedUser?.isEmpty ?? true) ? nil : trimmedUser
|
let user = (trimmedUser?.isEmpty ?? true) ? nil : trimmedUser
|
||||||
let port = parsed.port
|
let port = parsed.port
|
||||||
let assembled: String
|
let assembled = if let user {
|
||||||
if let user {
|
port == 22 ? "\(user)@\(host)" : "\(user)@\(host):\(port)"
|
||||||
assembled = port == 22 ? "\(user)@\(host)" : "\(user)@\(host):\(port)"
|
|
||||||
} else {
|
} else {
|
||||||
assembled = port == 22 ? host : "\(host):\(port)"
|
port == 22 ? host : "\(host):\(port)"
|
||||||
}
|
}
|
||||||
if assembled != self.remoteTarget {
|
if assembled != self.remoteTarget {
|
||||||
self.remoteTarget = assembled
|
self.remoteTarget = assembled
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { resolveIdentityNamePrefix } from "../../../agents/identity.js";
|
import { resolveHumanDelayConfig, resolveIdentityNamePrefix } from "../../../agents/identity.js";
|
||||||
import { resolveChunkMode, resolveTextChunkLimit } from "../../../auto-reply/chunk.js";
|
import { resolveChunkMode, resolveTextChunkLimit } from "../../../auto-reply/chunk.js";
|
||||||
import {
|
import {
|
||||||
formatInboundEnvelope,
|
formatInboundEnvelope,
|
||||||
@ -327,6 +327,7 @@ export async function processMessage(params: {
|
|||||||
dispatcherOptions: {
|
dispatcherOptions: {
|
||||||
responsePrefix,
|
responsePrefix,
|
||||||
responsePrefixContextProvider: prefixContext.responsePrefixContextProvider,
|
responsePrefixContextProvider: prefixContext.responsePrefixContextProvider,
|
||||||
|
humanDelay: resolveHumanDelayConfig(params.cfg, params.route.agentId),
|
||||||
onHeartbeatStrip: () => {
|
onHeartbeatStrip: () => {
|
||||||
if (!didLogHeartbeatStrip) {
|
if (!didLogHeartbeatStrip) {
|
||||||
didLogHeartbeatStrip = true;
|
didLogHeartbeatStrip = true;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user